projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge https://github.com/PeterHuewe/linux-tpmdd into for-linus
[firefly-linux-kernel-4.4.55.git]
/
net
/
8021q
/
vlan_core.c
diff --git
a/net/8021q/vlan_core.c
b/net/8021q/vlan_core.c
index 90cc2bdd406444df8c122066e0b5f23c33c8ed37..61bf2a06e85d62ce9d319b02f1bf1ebb569e3964 100644
(file)
--- a/
net/8021q/vlan_core.c
+++ b/
net/8021q/vlan_core.c
@@
-9,7
+9,7
@@
bool vlan_do_receive(struct sk_buff **skbp)
{
struct sk_buff *skb = *skbp;
__be16 vlan_proto = skb->vlan_proto;
- u16 vlan_id =
vlan_tx
_tag_get_id(skb);
+ u16 vlan_id =
skb_vlan
_tag_get_id(skb);
struct net_device *vlan_dev;
struct vlan_pcpu_stats *rx_stats;