---

yaml --- r: 330208 b: refs/heads/master c: 5316cf9 h: refs/heads/master v: v3
git-mirror · Oct 3, 2012 · 8502b81 · 8502b81
1 parent f741ff7
commit 8502b81
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 786fdf0bbf1c3a1b402bb2da946b93e0b36a8f32
+refs/heads/master: 5316cf9a5197eb80b2800e1acadde287924ca975
diff --git a/trunk/net/8021q/vlan_core.c b/trunk/net/8021q/vlan_core.c
@@ -105,7 +105,6 @@ static struct sk_buff *vlan_reorder_header(struct sk_buff *skb)
 		return NULL;
 	memmove(skb->data - ETH_HLEN, skb->data - VLAN_ETH_HLEN, 2 * ETH_ALEN);
 	skb->mac_header += VLAN_HLEN;
-	skb_reset_mac_len(skb);
 	return skb;
 }
 
@@ -139,6 +138,8 @@ struct sk_buff *vlan_untag(struct sk_buff *skb)
 
 	skb_reset_network_header(skb);
 	skb_reset_transport_header(skb);
+	skb_reset_mac_len(skb);
+
 	return skb;
 
 err_free: