diff options
| author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2018-11-10 19:58:36 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-11-16 19:25:28 -0800 |
| commit | 4b50d23179737e4b5f5f16e4bb58bedcf437addc (patch) | |
| tree | 08d7c5e9f29403d3688ae5fd6ca8e3d55f4f1802 /arch/sparc | |
| parent | 3955dec5376b9fc29f76273b7b92921ecefca99f (diff) | |
| download | linux-stable-4b50d23179737e4b5f5f16e4bb58bedcf437addc.tar.gz linux-stable-4b50d23179737e4b5f5f16e4bb58bedcf437addc.tar.bz2 linux-stable-4b50d23179737e4b5f5f16e4bb58bedcf437addc.zip | |
net/bpf_jit: SPARC: split VLAN_PRESENT bit handling from VLAN_TCI
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/net/bpf_jit_comp_32.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/arch/sparc/net/bpf_jit_comp_32.c b/arch/sparc/net/bpf_jit_comp_32.c index a5ff88643d5c..48f3c04dd179 100644 --- a/arch/sparc/net/bpf_jit_comp_32.c +++ b/arch/sparc/net/bpf_jit_comp_32.c @@ -552,15 +552,18 @@ void bpf_jit_compile(struct bpf_prog *fp) emit_skb_load32(hash, r_A); break; case BPF_ANC | SKF_AD_VLAN_TAG: - case BPF_ANC | SKF_AD_VLAN_TAG_PRESENT: emit_skb_load16(vlan_tci, r_A); - if (code != (BPF_ANC | SKF_AD_VLAN_TAG)) { - emit_alu_K(SRL, 12); +#ifdef VLAN_TAG_PRESENT + emit_loadimm(~VLAN_TAG_PRESENT, r_TMP); + emit_and(r_A, r_TMP, r_A); +#endif + break; + case BPF_ANC | SKF_AD_VLAN_TAG_PRESENT: + __emit_skb_load8(__pkt_vlan_present_offset, r_A); + if (PKT_VLAN_PRESENT_BIT) + emit_alu_K(SRL, PKT_VLAN_PRESENT_BIT); + if (PKT_VLAN_PRESENT_BIT < 7) emit_andi(r_A, 1, r_A); - } else { - emit_loadimm(~VLAN_TAG_PRESENT, r_TMP); - emit_and(r_A, r_TMP, r_A); - } break; case BPF_LD | BPF_W | BPF_LEN: emit_skb_load32(len, r_A); |