summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/net
diff options
context:
space:
mode:
authorMichał Mirosław2018-11-10 19:58:36 +0100
committerDavid S. Miller2018-11-17 04:25:29 +0100
commit0c4b2d370514cb4f3454dd3b18f031d2651fab73 (patch)
tree83c96b0c5bbf7c311fcee1ee1949c253d093fe57 /arch/powerpc/net
parentnet/bpf_jit: SPARC: split VLAN_PRESENT bit handling from VLAN_TCI (diff)
downloadkernel-qcow2-linux-0c4b2d370514cb4f3454dd3b18f031d2651fab73.tar.gz
kernel-qcow2-linux-0c4b2d370514cb4f3454dd3b18f031d2651fab73.tar.xz
kernel-qcow2-linux-0c4b2d370514cb4f3454dd3b18f031d2651fab73.zip
net: remove VLAN_TAG_PRESENT
Replace VLAN_TAG_PRESENT with single bit flag and free up VLAN.CFI overload. Now VLAN.CFI is visible in networking stack and can be passed around intact. Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/powerpc/net')
-rw-r--r--arch/powerpc/net/bpf_jit_comp.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/powerpc/net/bpf_jit_comp.c b/arch/powerpc/net/bpf_jit_comp.c
index dc4a2f54e829..91d223cf512b 100644
--- a/arch/powerpc/net/bpf_jit_comp.c
+++ b/arch/powerpc/net/bpf_jit_comp.c
@@ -383,9 +383,6 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image,
PPC_LHZ_OFFS(r_A, r_skb, offsetof(struct sk_buff,
vlan_tci));
-#ifdef VLAN_TAG_PRESENT
- PPC_ANDI(r_A, r_A, ~VLAN_TAG_PRESENT);
-#endif
break;
case BPF_ANC | SKF_AD_VLAN_TAG_PRESENT:
PPC_LBZ_OFFS(r_A, r_skb, PKT_VLAN_PRESENT_OFFSET());