diff mbox series

[next-net] net: gro: use vlan API instead of accessing directly

Message ID 1574426281-52829-1-git-send-email-xiangxia.m.yue@gmail.com
State Accepted
Delegated to: David Miller
Headers show
Series [next-net] net: gro: use vlan API instead of accessing directly | expand

Commit Message

Tonghao Zhang Nov. 22, 2019, 12:38 p.m. UTC 
From: Tonghao Zhang <xiangxia.m.yue@gmail.com>

Use vlan common api to access the vlan_tag info.

Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
---
 net/core/dev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jakub Kicinski Nov. 24, 2019, 2:08 a.m. UTC | #1 
On Fri, 22 Nov 2019 20:38:01 +0800, xiangxia.m.yue@gmail.com wrote:
> From: Tonghao Zhang <xiangxia.m.yue@gmail.com>
> 
> Use vlan common api to access the vlan_tag info.
> 
> Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>

Applied, thanks!
diff mbox series

Patch

diff --git a/net/core/dev.c b/net/core/dev.c
index da78a433c10c..c7fc902ccbdc 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -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)