net: filter: split 'struct sk_filter' into socket and bpf parts

[linux-block.git] / arch / arm / net / bpf_jit_32.c

diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
index fb5503ce016f0fa693f765f0157a2379422202dd..a37b989a2f91e302be654a7633082321e8f0c5bb 100644 (file)
--- a/arch/arm/net/bpf_jit_32.c
+++ b/arch/arm/net/bpf_jit_32.c
@@ -56,7 +56,7 @@
 #define FLAG_NEED_X_RESET      (1 << 0)
 
 struct jit_ctx {
-       const struct sk_filter *skf;
+       const struct bpf_prog *skf;
        unsigned idx;
        unsigned prologue_bytes;
        int ret0_fp_idx;
@@ -465,7 +465,7 @@ static inline void update_on_xread(struct jit_ctx *ctx)
 static int build_body(struct jit_ctx *ctx)
 {
        void *load_func[] = {jit_get_skb_b, jit_get_skb_h, jit_get_skb_w};
-       const struct sk_filter *prog = ctx->skf;
+       const struct bpf_prog *prog = ctx->skf;
        const struct sock_filter *inst;
        unsigned i, load_order, off, condt;
        int imm12;
@@ -857,7 +857,7 @@ b_epilogue:
 }
 
 
-void bpf_jit_compile(struct sk_filter *fp)
+void bpf_jit_compile(struct bpf_prog *fp)
 {
        struct jit_ctx ctx;
        unsigned tmp_idx;
@@ -926,7 +926,7 @@ out:
        return;
 }
 
-void bpf_jit_free(struct sk_filter *fp)
+void bpf_jit_free(struct bpf_prog *fp)
 {
        if (fp->jited)
                module_free(NULL, fp->bpf_func);