Commit e14fd8da authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents ce51f63e c3d897e0

drivers/net/hyperv/netvsc_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -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)) {