---

yaml --- r: 265355 b: refs/heads/master c: 0dfe178 h: refs/heads/master i: 265353: 1b69111 265351: db0d10e v: v3
git-mirror · Aug 22, 2011 · 46df3ee · 46df3ee
1 parent ce2d8e2
commit 46df3ee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8d755b59ae6750150d7f351210b97ad4cce5a51
+refs/heads/master: 0dfe178239453547d4297a4583ee7847948a481b
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -3236,10 +3236,9 @@ static int __netif_receive_skb(struct sk_buff *skb)
 			ret = deliver_skb(skb, pt_prev, orig_dev);
 			pt_prev = NULL;
 		}
-		if (vlan_do_receive(&skb)) {
-			ret = __netif_receive_skb(skb);
-			goto out;
-		} else if (unlikely(!skb))
+		if (vlan_do_receive(&skb))
+			goto another_round;
+		else if (unlikely(!skb))
 			goto out;
 	}