1 files changed, 8 insertions, 6 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 14de297d024d..4d891beab138 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1480,14 +1480,16 @@ gso:
         if (q->enqueue) {
                 /* Grab device queue */
                 spin_lock(&dev->queue_lock);
+                q = dev->qdisc;
+                if (q->enqueue) {
+                        rc = q->enqueue(skb, q);
+                        qdisc_run(dev);
+                        spin_unlock(&dev->queue_lock);
 
-                rc = q->enqueue(skb, q);
-
-                qdisc_run(dev);
-
+                        rc = rc == NET_XMIT_BYPASS ? NET_XMIT_SUCCESS : rc;
+                        goto out;
+                }
                 spin_unlock(&dev->queue_lock);
-                rc = rc == NET_XMIT_BYPASS ? NET_XMIT_SUCCESS : rc;
-                goto out;
         }
 
         /* The device has no queue. Common case for software devices: