ukui/kernel
0
0
Fork 0
mirror of https://github.com/ukui/kernel.git synced 2026-03-09 10:07:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net

Browse Source
This commit is contained in:
David S. Miller
2011-08-20 10:39:12 -07:00
parent eaa36660de 98e77438ae
commit 823dcd2506
265 changed files with 9171 additions and 8040 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/8021q/vlan_core.c
+2
View File
@@ -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: