]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commit
projects / ceph-client.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2cf7e87 be3ed48)
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)
commitf1a7178b44f3d82c21ee9d8a145ce5edbd5d3b99
tree542a8919dcb1b09d58af22b33bb805435420e18atree | snapshot
parent2cf7e87fc4592bcbed77448ebba68c2925f2a2afcommit | diff
parentbe3ed48683f0d7ed808783fd7d919459b58b5b6bcommit | diff
Merge branch 'net-vlan-claim-one-bit-from-sk_buff'

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>
Unnamed repository; edit this file 'description' to name the repository.