Merge branch 'net-vlan-claim-one-bit-from-sk_buff'
authorJakub Kicinski <kuba@kernel.org>
Sat, 12 Nov 2022 02:18:09 +0000 (18:18 -0800)
committerJakub Kicinski <kuba@kernel.org>
Sat, 12 Nov 2022 02:18:10 +0000 (18:18 -0800)
Eric Dumazet says:

====================
net: vlan: claim one bit from sk_buff

First patch claims skb->vlan_present.
This means some bpf changes, eg for sparc32 that I could not test.

Second patch removes one conditional test in gro_list_prepare().
====================

Link: https://lore.kernel.org/r/20221109095759.1874969-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Trivial merge