diff options
| author | David S. Miller <davem@davemloft.net> | 2020-08-20 16:24:00 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-08-20 16:24:00 -0700 |
| commit | e14fd8da84123fbd7d03aa2c28501879887f2cdd (patch) | |
| tree | 07bb72531e105c2694e50b01079d75ef87a6b1b4 | |
| parent | ce51f63e63c52a4e1eee4dd040fb0ba0af3b43ab (diff) | |
| parent | c3d897e01aef8ddc43149e4d661b86f823e3aae7 (diff) | |
Merge branch 'hv_netvsc-Some-fixes-for-the-select_queue'
Haiyang Zhang says:
====================
hv_netvsc: Some fixes for the select_queue
This patch set includes two fixes for the select_queue process.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/hyperv/netvsc_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index 787f17e2a971..64b0a74c1523 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -367,7 +367,7 @@ static u16 netvsc_select_queue(struct net_device *ndev, struct sk_buff *skb, } rcu_read_unlock(); - while (unlikely(txq >= ndev->real_num_tx_queues)) + while (txq >= ndev->real_num_tx_queues) txq -= ndev->real_num_tx_queues; return txq; @@ -502,7 +502,7 @@ static int netvsc_vf_xmit(struct net_device *net, struct net_device *vf_netdev, int rc; skb->dev = vf_netdev; - skb->queue_mapping = qdisc_skb_cb(skb)->slave_dev_queue_mapping; + skb_record_rx_queue(skb, qdisc_skb_cb(skb)->slave_dev_queue_mapping); rc = dev_queue_xmit(skb); if (likely(rc == NET_XMIT_SUCCESS || rc == NET_XMIT_CN)) { |