---

yaml --- r: 108819 b: refs/heads/master c: 96d2031 h: refs/heads/master i: 108817: 9ba7964 108815: fee289b v: v3
git-mirror · Aug 18, 2008 · 2a6a77c · 2a6a77c
1 parent 471a80a
commit 2a6a77c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13601cd8e44aab332cedff1d6dc10786ec890b7b
+refs/heads/master: 96d203169d1d851ac1468f7d4459a09581be364c
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -1805,14 +1805,12 @@ int dev_queue_xmit(struct sk_buff *skb)
 		spin_lock(root_lock);
 
 		if (unlikely(test_bit(__QDISC_STATE_DEACTIVATED, &q->state))) {
-			spin_unlock(root_lock);
+			kfree_skb(skb);
 			rc = NET_XMIT_DROP;
-			goto out_kfree_skb;
+		} else {
+			rc = qdisc_enqueue_root(skb, q);
+			qdisc_run(q);
 		}
-
-		rc = qdisc_enqueue_root(skb, q);
-		qdisc_run(q);
-
 		spin_unlock(root_lock);
 
 		goto out;