1 files changed, 35 insertions, 13 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index f01a9c41f112..a0bc087616a4 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1786,6 +1786,40 @@ static struct netdev_queue *dev_pick_tx(struct net_device *dev,
         return netdev_get_tx_queue(dev, queue_index);
 }
 
+static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,
+                                 struct net_device *dev,
+                                 struct netdev_queue *txq)
+{
+        spinlock_t *root_lock = qdisc_lock(q);
+        int rc;
+
+        spin_lock(root_lock);
+        if (unlikely(test_bit(__QDISC_STATE_DEACTIVATED, &q->state))) {
+                kfree_skb(skb);
+                rc = NET_XMIT_DROP;
+        } else if ((q->flags & TCQ_F_CAN_BYPASS) && !qdisc_qlen(q) &&
+                   !test_and_set_bit(__QDISC_STATE_RUNNING, &q->state)) {
+                /*
+                 * This is a work-conserving queue; there are no old skbs
+                 * waiting to be sent out; and the qdisc is not running -
+                 * xmit the skb directly.
+                 */
+                __qdisc_update_bstats(q, skb->len);
+                if (sch_direct_xmit(skb, q, dev, txq, root_lock))
+                        __qdisc_run(q);
+                else
+                        clear_bit(__QDISC_STATE_RUNNING, &q->state);
+
+                rc = NET_XMIT_SUCCESS;
+        } else {
+                rc = qdisc_enqueue_root(skb, q);
+                qdisc_run(q);
+        }
+        spin_unlock(root_lock);
+
+        return rc;
+}
+
 /**
  *      dev_queue_xmit - transmit a buffer
  *      @skb: buffer to transmit
@@ -1859,19 +1893,7 @@ gso:
         skb->tc_verd = SET_TC_AT(skb->tc_verd,AT_EGRESS);
 #endif
         if (q->enqueue) {
-                spinlock_t *root_lock = qdisc_lock(q);
-
-                spin_lock(root_lock);
-
-                if (unlikely(test_bit(__QDISC_STATE_DEACTIVATED, &q->state))) {
-                        kfree_skb(skb);
-                        rc = NET_XMIT_DROP;
-                } else {
-                        rc = qdisc_enqueue_root(skb, q);
-                        qdisc_run(q);
-                }
-                spin_unlock(root_lock);
-
+                rc = __dev_xmit_skb(skb, q, dev, txq);
                 goto out;
         }