Merge branch 'Remove-VLAN-CFI-overload'

Browse source

Michał Mirosław says:

====================
Remove VLAN.CFI overload

Fix BPF code/JITs to allow for separate VLAN_PRESENT flag
storage and finally move the flag to separate storage in skbuff.

This is final step to make CLAN.CFI transparent to core Linux
networking stack.

An #ifdef is introduced temporarily to mark fragments masking
VLAN_TAG_PRESENT. This is removed altogether in the final patch.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2018-11-16 19:25:29 -08:00

parent 5aa25c05be 0c4b2d3705

commit 6551971ea8

7 changed files with 60 additions and 55 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

18

arch/mips/net/bpf_jit.c

View file

15

arch/powerpc/net/bpf_jit_comp.c

View file

13

arch/sparc/net/bpf_jit_comp_32.c

View file

11

include/linux/if_vlan.h

View file

10

include/linux/skbuff.h

View file

14

lib/test_bpf.c

View file

34

net/core/filter.c

View file