mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 17:59:32 +00:00
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>
This commit is contained in:
commit
e14fd8da84
1 changed files with 2 additions and 2 deletions
|
@ -367,7 +367,7 @@ static u16 netvsc_select_queue(struct net_device *ndev, struct sk_buff *skb,
|
||||||
}
|
}
|
||||||
rcu_read_unlock();
|
rcu_read_unlock();
|
||||||
|
|
||||||
while (unlikely(txq >= ndev->real_num_tx_queues))
|
while (txq >= ndev->real_num_tx_queues)
|
||||||
txq -= ndev->real_num_tx_queues;
|
txq -= ndev->real_num_tx_queues;
|
||||||
|
|
||||||
return txq;
|
return txq;
|
||||||
|
@ -502,7 +502,7 @@ static int netvsc_vf_xmit(struct net_device *net, struct net_device *vf_netdev,
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
skb->dev = vf_netdev;
|
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);
|
rc = dev_queue_xmit(skb);
|
||||||
if (likely(rc == NET_XMIT_SUCCESS || rc == NET_XMIT_CN)) {
|
if (likely(rc == NET_XMIT_SUCCESS || rc == NET_XMIT_CN)) {
|
||||||
|
|
Loading…
Reference in a new issue