* [PATCH next-net] net: gro: use vlan API instead of accessing directly
@ 2019-11-22 12:38 xiangxia.m.yue
2019-11-24 2:08 ` Jakub Kicinski
0 siblings, 1 reply; 2+ messages in thread
From: xiangxia.m.yue @ 2019-11-22 12:38 UTC (permalink / raw)
To: netdev; +Cc: Tonghao Zhang
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(-)
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)
--
2.23.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH next-net] net: gro: use vlan API instead of accessing directly
2019-11-22 12:38 [PATCH next-net] net: gro: use vlan API instead of accessing directly xiangxia.m.yue
@ 2019-11-24 2:08 ` Jakub Kicinski
0 siblings, 0 replies; 2+ messages in thread
From: Jakub Kicinski @ 2019-11-24 2:08 UTC (permalink / raw)
To: xiangxia.m.yue; +Cc: netdev
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!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-11-24 2:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-22 12:38 [PATCH next-net] net: gro: use vlan API instead of accessing directly xiangxia.m.yue
2019-11-24 2:08 ` Jakub Kicinski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).