summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMarkos Chandras <markos.chandras@imgtec.com>2014-06-23 10:38:49 +0100
committerRalf Baechle <ralf@linux-mips.org>2014-06-26 10:48:20 +0100
commit9ee1606e8a6316287029c86ef48ddcfe4dec595d (patch)
treeac92a4aab0e570e76a6d25001aa57cb4a519a055 /arch
parent55393ee535496f7db15f3b2e9d3cf418f772f71a (diff)
downloadlinux-9ee1606e8a6316287029c86ef48ddcfe4dec595d.tar.bz2
MIPS: bpf: Use 'andi' instead of 'and' for the VLAN cases
The VLAN_VID_MASK and VLAN_TAG_PRESENT are immediates, so using 'and' which expects 3 registers will produce wrong results. Fix this by using the 'andi' instruction. Signed-off-by: Markos Chandras <markos.chandras@imgtec.com> Cc: David S. Miller <davem@davemloft.net> Cc: Daniel Borkmann <dborkman@redhat.com> Cc: Alexei Starovoitov <ast@plumgrid.com> Cc: netdev@vger.kernel.org Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/7124/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/net/bpf_jit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/net/bpf_jit.c b/arch/mips/net/bpf_jit.c
index 95728ea6cb74..fe5041bdc6fb 100644
--- a/arch/mips/net/bpf_jit.c
+++ b/arch/mips/net/bpf_jit.c
@@ -1317,9 +1317,9 @@ jmp_cmp:
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_and(r_A, r_s0, VLAN_VID_MASK, ctx);
+ emit_andi(r_A, r_s0, VLAN_VID_MASK, ctx);
else
- emit_and(r_A, r_s0, VLAN_TAG_PRESENT, ctx);
+ emit_andi(r_A, r_s0, VLAN_TAG_PRESENT, ctx);
break;
case BPF_ANC | SKF_AD_PKTTYPE:
off = pkt_type_offset();