7 files changed, 19 insertions, 21 deletions

diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c
index 81b22a180aad..6427e8283419 100644
--- a/drivers/net/wan/dlci.c
+++ b/drivers/net/wan/dlci.c
@@ -192,8 +192,10 @@ static netdev_tx_t dlci_transmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct dlci_local *dlp = netdev_priv(dev);
 
-        if (skb)
-                netdev_start_xmit(skb, dlp->slave);
+        if (skb) {
+                struct netdev_queue *txq = skb_get_tx_queue(dev, skb);
+                netdev_start_xmit(skb, dlp->slave, txq);
+        }
         return NETDEV_TX_OK;
 }
 
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 456eb1fe51e8..16171802ea7d 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -3437,11 +3437,17 @@ static inline netdev_tx_t __netdev_start_xmit(const struct net_device_ops *ops,
         return ops->ndo_start_xmit(skb, dev);
 }
 
-static inline netdev_tx_t netdev_start_xmit(struct sk_buff *skb, struct net_device *dev)
+static inline netdev_tx_t netdev_start_xmit(struct sk_buff *skb, struct net_device *dev,
+                                            struct netdev_queue *txq)
 {
         const struct net_device_ops *ops = dev->netdev_ops;
+        int rc;
 
-        return __netdev_start_xmit(ops, skb, dev);
+        rc = __netdev_start_xmit(ops, skb, dev);
+        if (rc == NETDEV_TX_OK)
+                txq_trans_update(txq);
+
+        return rc;
 }
 
 int netdev_class_create_file_ns(struct class_attribute *class_attr,
diff --git a/net/core/dev.c b/net/core/dev.c
index a6077ef56345..6392adaaa22f 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2666,10 +2666,8 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
 
                 skb_len = skb->len;
                 trace_net_dev_start_xmit(skb, dev);
-                rc = netdev_start_xmit(skb, dev);
+                rc = netdev_start_xmit(skb, dev, txq);
                 trace_net_dev_xmit(skb, rc, dev, skb_len);
-                if (rc == NETDEV_TX_OK)
-                        txq_trans_update(txq);
                 return rc;
         }
 
@@ -2685,7 +2683,7 @@ gso:
 
                 skb_len = nskb->len;
                 trace_net_dev_start_xmit(nskb, dev);
-                rc = netdev_start_xmit(nskb, dev);
+                rc = netdev_start_xmit(nskb, dev, txq);
                 trace_net_dev_xmit(nskb, rc, dev, skb_len);
                 if (unlikely(rc != NETDEV_TX_OK)) {
                         if (rc & ~NETDEV_TX_MASK)
@@ -2694,7 +2692,6 @@ gso:
                         skb->next = nskb;
                         return rc;
                 }
-                txq_trans_update(txq);
                 if (unlikely(netif_xmit_stopped(txq) && skb->next))
                         return NETDEV_TX_BUSY;
         } while (skb->next);
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 12b1df976562..05bc57edaa81 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -91,9 +91,7 @@ static int netpoll_start_xmit(struct sk_buff *skb, struct net_device *dev,
                 skb->vlan_tci = 0;
         }
 
-        status = netdev_start_xmit(skb, dev);
-        if (status == NETDEV_TX_OK)
-                txq_trans_update(txq);
+        status = netdev_start_xmit(skb, dev, txq);
 
 out:
         return status;
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index d81b540096c3..34bd2ff9f121 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -3335,11 +3335,10 @@ static void pktgen_xmit(struct pktgen_dev *pkt_dev)
                 goto unlock;
         }
         atomic_inc(&(pkt_dev->skb->users));
-        ret = netdev_start_xmit(pkt_dev->skb, odev);
+        ret = netdev_start_xmit(pkt_dev->skb, odev, txq);
 
         switch (ret) {
         case NETDEV_TX_OK:
-                txq_trans_update(txq);
                 pkt_dev->last_ok = 1;
                 pkt_dev->sofar++;
                 pkt_dev->seq_num++;
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index b7a7f5a721bd..fe305a05a8fc 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -258,11 +258,8 @@ static int packet_direct_xmit(struct sk_buff *skb)
         local_bh_disable();
 
         HARD_TX_LOCK(dev, txq, smp_processor_id());
-        if (!netif_xmit_frozen_or_drv_stopped(txq)) {
-                ret = netdev_start_xmit(skb, dev);
-                if (ret == NETDEV_TX_OK)
-                        txq_trans_update(txq);
-        }
+        if (!netif_xmit_frozen_or_drv_stopped(txq))
+                ret = netdev_start_xmit(skb, dev, txq);
         HARD_TX_UNLOCK(dev, txq);
 
         local_bh_enable();
diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c
index 64cd93ca8104..193dc2cba1ec 100644
--- a/net/sched/sch_teql.c
+++ b/net/sched/sch_teql.c
@@ -316,8 +316,7 @@ restart:
                                 unsigned int length = qdisc_pkt_len(skb);
 
                                 if (!netif_xmit_frozen_or_stopped(slave_txq) &&
-                                    netdev_start_xmit(skb, slave) == NETDEV_TX_OK) {
-                                        txq_trans_update(slave_txq);
+                                    netdev_start_xmit(skb, slave, slave_txq) == NETDEV_TX_OK) {
                                         __netif_tx_unlock(slave_txq);
                                         master->slaves = NEXT_SLAVE(q);
                                         netif_wake_queue(dev);