diff options
| author | David S. Miller <davem@davemloft.net> | 2011-08-20 13:39:12 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-20 13:39:12 -0400 |
| commit | 823dcd2506fa369aeb8cbd26da5663efe2fda9a9 (patch) | |
| tree | 853b3e3c05f0b9ee1b5df8464db19b7acc57150c /net/8021q | |
| parent | eaa36660de7e174498618d69d7277d44a2f24c3d (diff) | |
| parent | 98e77438aed3cd3343cbb86825127b1d9d2bea33 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/8021q')
| -rw-r--r-- | net/8021q/vlan_core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c index 5f27f8e30254..f1f2f7bb6661 100644 --- a/net/8021q/vlan_core.c +++ b/net/8021q/vlan_core.c | |||
| @@ -167,6 +167,8 @@ struct sk_buff *vlan_untag(struct sk_buff *skb) | |||
| 167 | if (unlikely(!skb)) | 167 | if (unlikely(!skb)) |
| 168 | goto err_free; | 168 | goto err_free; |
| 169 | 169 | ||
| 170 | skb_reset_network_header(skb); | ||
| 171 | skb_reset_transport_header(skb); | ||
| 170 | return skb; | 172 | return skb; |
| 171 | 173 | ||
| 172 | err_free: | 174 | err_free: |