---

yaml --- r: 266841 b: refs/heads/master c: 2425717 h: refs/heads/master i: 266839: 5f82a10 v: v3
git-mirror · Oct 19, 2011 · 1c92784 · 1c92784
1 parent 991b951
commit 1c92784
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b340a207c5d81a0a33899e8ab3236a04dd8b48c3
+refs/heads/master: 2425717b27eb92b175335ca4ff0bb218cbe0cb64
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -3231,6 +3231,17 @@ static int __netif_receive_skb(struct sk_buff *skb)
 ncls:
 #endif
 
+	if (vlan_tx_tag_present(skb)) {
+		if (pt_prev) {
+			ret = deliver_skb(skb, pt_prev, orig_dev);
+			pt_prev = NULL;
+		}
+		if (vlan_do_receive(&skb))
+			goto another_round;
+		else if (unlikely(!skb))
+			goto out;
+	}
+
 	rx_handler = rcu_dereference(skb->dev->rx_handler);
 	if (rx_handler) {
 		if (pt_prev) {
@@ -3251,17 +3262,6 @@ static int __netif_receive_skb(struct sk_buff *skb)
 		}
 	}
 
-	if (vlan_tx_tag_present(skb)) {
-		if (pt_prev) {
-			ret = deliver_skb(skb, pt_prev, orig_dev);
-			pt_prev = NULL;
-		}
-		if (vlan_do_receive(&skb))
-			goto another_round;
-		else if (unlikely(!skb))
-			goto out;
-	}
-
 	/* deliver only exact match when indicated */
 	null_or_dev = deliver_exact ? skb->dev : NULL;