From 46df3eeb692e65ed6604a2e0f483e690f0d3462b Mon Sep 17 00:00:00 2001
From: Jiri Pirko <jpirko@redhat.com>
Date: Mon, 22 Aug 2011 12:43:22 -0700
Subject: [PATCH] --- yaml --- r: 265355 b: refs/heads/master c:
 0dfe178239453547d4297a4583ee7847948a481b h: refs/heads/master i:   265353:
 1b69111346fce4b7f823d4a6d46aa16ac9106af0   265351:
 db0d10efe83b3db6517a18a4a74813d9a81d05c4 v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dev.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 75a396774a04..af11b5173cd9 100644
--- 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
index c2442b46646e..a4306f7e4d09 100644
--- 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;
 	}