diff options
Diffstat (limited to 'net/core/dev.c')
-rw-r--r-- | net/core/dev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 38b03da5c1ca..872658927e47 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -1553,7 +1553,7 @@ gso: | |||
1553 | return rc; | 1553 | return rc; |
1554 | } | 1554 | } |
1555 | if (unlikely((netif_queue_stopped(dev) || | 1555 | if (unlikely((netif_queue_stopped(dev) || |
1556 | netif_subqueue_stopped(dev, skb->queue_mapping)) && | 1556 | netif_subqueue_stopped(dev, skb)) && |
1557 | skb->next)) | 1557 | skb->next)) |
1558 | return NETDEV_TX_BUSY; | 1558 | return NETDEV_TX_BUSY; |
1559 | } while (skb->next); | 1559 | } while (skb->next); |
@@ -1661,7 +1661,7 @@ gso: | |||
1661 | q = dev->qdisc; | 1661 | q = dev->qdisc; |
1662 | if (q->enqueue) { | 1662 | if (q->enqueue) { |
1663 | /* reset queue_mapping to zero */ | 1663 | /* reset queue_mapping to zero */ |
1664 | skb->queue_mapping = 0; | 1664 | skb_set_queue_mapping(skb, 0); |
1665 | rc = q->enqueue(skb, q); | 1665 | rc = q->enqueue(skb, q); |
1666 | qdisc_run(dev); | 1666 | qdisc_run(dev); |
1667 | spin_unlock(&dev->queue_lock); | 1667 | spin_unlock(&dev->queue_lock); |
@@ -1692,7 +1692,7 @@ gso: | |||
1692 | HARD_TX_LOCK(dev, cpu); | 1692 | HARD_TX_LOCK(dev, cpu); |
1693 | 1693 | ||
1694 | if (!netif_queue_stopped(dev) && | 1694 | if (!netif_queue_stopped(dev) && |
1695 | !netif_subqueue_stopped(dev, skb->queue_mapping)) { | 1695 | !netif_subqueue_stopped(dev, skb)) { |
1696 | rc = 0; | 1696 | rc = 0; |
1697 | if (!dev_hard_start_xmit(skb, dev)) { | 1697 | if (!dev_hard_start_xmit(skb, dev)) { |
1698 | HARD_TX_UNLOCK(dev); | 1698 | HARD_TX_UNLOCK(dev); |