diff options
author | Alexei Starovoitov <ast@plumgrid.com> | 2014-06-06 01:47:44 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-06-06 03:43:27 -0400 |
commit | 569810d1e3278907264f5b115281fca3f0038d53 (patch) | |
tree | 3096ffd22d9a3780a6859ac9e71b67cb7d2b378d /arch/sparc/net/bpf_jit_comp.c | |
parent | 586d5fc867be8f03c049b4b89fd29d0b8b02cab5 (diff) |
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: 2809a2087cc4 ("net: filter: Just In Time compiler for sparc")
Signed-off-by: Alexei Starovoitov <ast@plumgrid.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/net/bpf_jit_comp.c')
-rw-r--r-- | arch/sparc/net/bpf_jit_comp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sparc/net/bpf_jit_comp.c b/arch/sparc/net/bpf_jit_comp.c index a82c6b2a9780..b19a0c2a1ae6 100644 --- a/arch/sparc/net/bpf_jit_comp.c +++ b/arch/sparc/net/bpf_jit_comp.c | |||
@@ -83,9 +83,9 @@ static void bpf_flush_icache(void *start_, void *end_) | |||
83 | #define BNE (F2(0, 2) | CONDNE) | 83 | #define BNE (F2(0, 2) | CONDNE) |
84 | 84 | ||
85 | #ifdef CONFIG_SPARC64 | 85 | #ifdef CONFIG_SPARC64 |
86 | #define BNE_PTR (F2(0, 1) | CONDNE | (2 << 20)) | 86 | #define BE_PTR (F2(0, 1) | CONDE | (2 << 20)) |
87 | #else | 87 | #else |
88 | #define BNE_PTR BNE | 88 | #define BE_PTR BNE |
89 | #endif | 89 | #endif |
90 | 90 | ||
91 | #define SETHI(K, REG) \ | 91 | #define SETHI(K, REG) \ |
@@ -600,7 +600,7 @@ void bpf_jit_compile(struct sk_filter *fp) | |||
600 | case BPF_S_ANC_IFINDEX: | 600 | case BPF_S_ANC_IFINDEX: |
601 | emit_skb_loadptr(dev, r_A); | 601 | emit_skb_loadptr(dev, r_A); |
602 | emit_cmpi(r_A, 0); | 602 | emit_cmpi(r_A, 0); |
603 | emit_branch(BNE_PTR, cleanup_addr + 4); | 603 | emit_branch(BE_PTR, cleanup_addr + 4); |
604 | emit_nop(); | 604 | emit_nop(); |
605 | emit_load32(r_A, struct net_device, ifindex, r_A); | 605 | emit_load32(r_A, struct net_device, ifindex, r_A); |
606 | break; | 606 | break; |
@@ -613,7 +613,7 @@ void bpf_jit_compile(struct sk_filter *fp) | |||
613 | case BPF_S_ANC_HATYPE: | 613 | case BPF_S_ANC_HATYPE: |
614 | emit_skb_loadptr(dev, r_A); | 614 | emit_skb_loadptr(dev, r_A); |
615 | emit_cmpi(r_A, 0); | 615 | emit_cmpi(r_A, 0); |
616 | emit_branch(BNE_PTR, cleanup_addr + 4); | 616 | emit_branch(BE_PTR, cleanup_addr + 4); |
617 | emit_nop(); | 617 | emit_nop(); |
618 | emit_load16(r_A, struct net_device, type, r_A); | 618 | emit_load16(r_A, struct net_device, type, r_A); |
619 | break; | 619 | break; |