Commit 569810d1 authored by Alexei Starovoitov's avatar Alexei Starovoitov Committed by David S. Miller

net: filter: fix typo in sparc BPF JIT

fix typo in sparc codegen for SKF_AD_IFINDEX and SKF_AD_HATYPE
classic BPF extensions

Fixes: 2809a208 ("net: filter: Just In Time compiler for sparc")
Signed-off-by: default avatarAlexei Starovoitov <ast@plumgrid.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 586d5fc8
...@@ -83,9 +83,9 @@ static void bpf_flush_icache(void *start_, void *end_) ...@@ -83,9 +83,9 @@ static void bpf_flush_icache(void *start_, void *end_)
#define BNE (F2(0, 2) | CONDNE) #define BNE (F2(0, 2) | CONDNE)
#ifdef CONFIG_SPARC64 #ifdef CONFIG_SPARC64
#define BNE_PTR (F2(0, 1) | CONDNE | (2 << 20)) #define BE_PTR (F2(0, 1) | CONDE | (2 << 20))
#else #else
#define BNE_PTR BNE #define BE_PTR BNE
#endif #endif
#define SETHI(K, REG) \ #define SETHI(K, REG) \
...@@ -600,7 +600,7 @@ void bpf_jit_compile(struct sk_filter *fp) ...@@ -600,7 +600,7 @@ void bpf_jit_compile(struct sk_filter *fp)
case BPF_S_ANC_IFINDEX: case BPF_S_ANC_IFINDEX:
emit_skb_loadptr(dev, r_A); emit_skb_loadptr(dev, r_A);
emit_cmpi(r_A, 0); emit_cmpi(r_A, 0);
emit_branch(BNE_PTR, cleanup_addr + 4); emit_branch(BE_PTR, cleanup_addr + 4);
emit_nop(); emit_nop();
emit_load32(r_A, struct net_device, ifindex, r_A); emit_load32(r_A, struct net_device, ifindex, r_A);
break; break;
...@@ -613,7 +613,7 @@ void bpf_jit_compile(struct sk_filter *fp) ...@@ -613,7 +613,7 @@ void bpf_jit_compile(struct sk_filter *fp)
case BPF_S_ANC_HATYPE: case BPF_S_ANC_HATYPE:
emit_skb_loadptr(dev, r_A); emit_skb_loadptr(dev, r_A);
emit_cmpi(r_A, 0); emit_cmpi(r_A, 0);
emit_branch(BNE_PTR, cleanup_addr + 4); emit_branch(BE_PTR, cleanup_addr + 4);
emit_nop(); emit_nop();
emit_load16(r_A, struct net_device, type, r_A); emit_load16(r_A, struct net_device, type, r_A);
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment