From c44f5d844f7b28b907315cc359817b8d3f607f73 Mon Sep 17 00:00:00 2001
From: Jiri Pirko <jpirko@redhat.com>
Date: Thu, 18 Aug 2011 21:29:27 -0700
Subject: [PATCH] --- yaml --- r: 263229 b: refs/heads/master c:
 c5114cd59d2664f258b0d021d79b1532d94bdc2b h: refs/heads/master i:   263227:
 3f899ee212723f1db9258c95418d1786644dd9f3 v: v3

---
 [refs]                      | 2 +-
 trunk/net/8021q/vlan_core.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 478bc5dceb68..707ee7243c61 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9331db4f00cfee8a79d2147ac83723ef436b9759
+refs/heads/master: c5114cd59d2664f258b0d021d79b1532d94bdc2b
diff --git a/trunk/net/8021q/vlan_core.c b/trunk/net/8021q/vlan_core.c
index 5f27f8e30254..f1f2f7bb6661 100644
--- a/trunk/net/8021q/vlan_core.c
+++ b/trunk/net/8021q/vlan_core.c
@@ -167,6 +167,8 @@ struct sk_buff *vlan_untag(struct sk_buff *skb)
 	if (unlikely(!skb))
 		goto err_free;
 
+	skb_reset_network_header(skb);
+	skb_reset_transport_header(skb);
 	return skb;
 
 err_free: