Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 263229
b: refs/heads/master
c: c5114cd
h: refs/heads/master
i:
  263227: 3f899ee
v: v3
  • Loading branch information
Jiri Pirko authored and David S. Miller committed Aug 19, 2011
1 parent cab8ae8 commit c44f5d8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9331db4f00cfee8a79d2147ac83723ef436b9759
refs/heads/master: c5114cd59d2664f258b0d021d79b1532d94bdc2b
2 changes: 2 additions & 0 deletions trunk/net/8021q/vlan_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit c44f5d8

Please sign in to comment.