[PATCH net-next v2 20/27] net/bpf_jit: MIPS: split VLAN_PRESENT bit handling from VLAN_TCI

[Michał Mirosław]

Acked-by: Ralf Baechle <r...@linux-mips.org>
Signed-off-by: Michał Mirosław <mirq-li...@rere.qmqm.pl>
---
 arch/mips/net/bpf_jit.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/arch/mips/net/bpf_jit.c b/arch/mips/net/bpf_jit.c
index 49a2e2226fee..4b12b5df47e8 100644
--- a/arch/mips/net/bpf_jit.c
+++ b/arch/mips/net/bpf_jit.c
@@ -1138,19 +1138,23 @@ static int build_body(struct jit_ctx *ctx)
                        emit_load(r_A, r_skb, off, ctx);
                        break;
                case BPF_ANC | SKF_AD_VLAN_TAG:
-               case BPF_ANC | SKF_AD_VLAN_TAG_PRESENT:
                        ctx->flags |= SEEN_SKB | SEEN_A;
                        BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff,
                                                  vlan_tci) != 2);
                        off = offsetof(struct sk_buff, vlan_tci);
                        emit_half_load(r_s0, r_skb, off, ctx);
-                       if (code == (BPF_ANC | SKF_AD_VLAN_TAG)) {
-                               emit_andi(r_A, r_s0, (u16)~VLAN_TAG_PRESENT, 
ctx);
-                       } else {
-                               emit_andi(r_A, r_s0, VLAN_TAG_PRESENT, ctx);
-                               /* return 1 if present */
-                               emit_sltu(r_A, r_zero, r_A, ctx);
-                       }
+#ifdef VLAN_TAG_PRESENT
+                       emit_andi(r_A, r_s0, (u16)~VLAN_TAG_PRESENT, ctx);
+#endif
+                       break;
+               case BPF_ANC | SKF_AD_VLAN_TAG_PRESENT:
+                       ctx->flags |= SEEN_SKB | SEEN_A;
+                       emit_load_byte(r_A, r_skb, PKT_VLAN_PRESENT_OFFSET(), 
ctx);
+                       if (PKT_VLAN_PRESENT_BIT)
+                               emit_srl(r_A, r_A, PKT_VLAN_PRESENT_BIT, ctx);
+                       emit_andi(r_A, r_s0, 1, ctx);
+                       /* return 1 if present */
+                       emit_sltu(r_A, r_zero, r_A, ctx);
                        break;
                case BPF_ANC | SKF_AD_PKTTYPE:
                        ctx->flags |= SEEN_SKB;
-- 
2.11.0