]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
net: gro: use vlan API instead of accessing directly
authorTonghao Zhang <xiangxia.m.yue@gmail.com>
Fri, 22 Nov 2019 12:38:01 +0000 (20:38 +0800)
committerJakub Kicinski <jakub.kicinski@netronome.com>
Sun, 24 Nov 2019 02:06:51 +0000 (18:06 -0800)
Use vlan common api to access the vlan_tag info.

Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
net/core/dev.c

index da78a433c10c859238259840e154e5712ab8f368..c7fc902ccbdc5895a373c441f304b5e868a60dd3 100644 (file)
@@ -5586,7 +5586,7 @@ static struct list_head *gro_list_prepare(struct napi_struct *napi,
                diffs = (unsigned long)p->dev ^ (unsigned long)skb->dev;
                diffs |= skb_vlan_tag_present(p) ^ skb_vlan_tag_present(skb);
                if (skb_vlan_tag_present(p))
-                       diffs |= p->vlan_tci ^ skb->vlan_tci;
+                       diffs |= skb_vlan_tag_get(p) ^ skb_vlan_tag_get(skb);
                diffs |= skb_metadata_dst_cmp(p, skb);
                diffs |= skb_metadata_differs(p, skb);
                if (maclen == ETH_HLEN)