Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+2 -2
+2 -2
drivers/net/hyperv/netvsc_drv.c
··· 367 367 } 368 368 rcu_read_unlock(); 369 369 370 - while (unlikely(txq >= ndev->real_num_tx_queues)) 370 + while (txq >= ndev->real_num_tx_queues) 371 371 txq -= ndev->real_num_tx_queues; 372 372 373 373 return txq; ··· 502 502 int rc; 503 503 504 504 skb->dev = vf_netdev; 505 - skb->queue_mapping = qdisc_skb_cb(skb)->slave_dev_queue_mapping; 505 + skb_record_rx_queue(skb, qdisc_skb_cb(skb)->slave_dev_queue_mapping); 506 506 507 507 rc = dev_queue_xmit(skb); 508 508 if (likely(rc == NET_XMIT_SUCCESS || rc == NET_XMIT_CN)) {