1 files changed, 8 insertions, 8 deletions

diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
index 99bef86ed6df..5c8cb8043c5a 100644
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
@@ -211,10 +211,10 @@ struct jit_context {
         bool seen_ld_abs;
 };
 
-static int do_jit(struct sk_filter *bpf_prog, int *addrs, u8 *image,
+static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image,
                   int oldproglen, struct jit_context *ctx)
 {
-        struct sock_filter_int *insn = bpf_prog->insnsi;
+        struct bpf_insn *insn = bpf_prog->insnsi;
         int insn_cnt = bpf_prog->len;
         u8 temp[64];
         int i;
@@ -235,7 +235,7 @@ static int do_jit(struct sk_filter *bpf_prog, int *addrs, u8 *image,
         /* mov qword ptr [rbp-X],rbx */
         EMIT3_off32(0x48, 0x89, 0x9D, -stacksize);
 
-        /* sk_convert_filter() maps classic BPF register X to R7 and uses R8
+        /* bpf_convert_filter() maps classic BPF register X to R7 and uses R8
          * as temporary, so all tcpdump filters need to spill/fill R7(r13) and
          * R8(r14). R9(r15) spill could be made conditional, but there is only
          * one 'bpf_error' return path out of helper functions inside bpf_jit.S
@@ -841,7 +841,7 @@ common_load:		ctx->seen_ld_abs = true;
                         /* By design x64 JIT should support all BPF instructions
                          * This error will be seen if new instruction was added
                          * to interpreter, but not to JIT
-                         * or if there is junk in sk_filter
+                         * or if there is junk in bpf_prog
                          */
                         pr_err("bpf_jit: unknown opcode %02x\n", insn->code);
                         return -EINVAL;
@@ -862,11 +862,11 @@ common_load:		ctx->seen_ld_abs = true;
         return proglen;
 }
 
-void bpf_jit_compile(struct sk_filter *prog)
+void bpf_jit_compile(struct bpf_prog *prog)
 {
 }
 
-void bpf_int_jit_compile(struct sk_filter *prog)
+void bpf_int_jit_compile(struct bpf_prog *prog)
 {
         struct bpf_binary_header *header = NULL;
         int proglen, oldproglen = 0;
@@ -932,7 +932,7 @@ out:
 
 static void bpf_jit_free_deferred(struct work_struct *work)
 {
-        struct sk_filter *fp = container_of(work, struct sk_filter, work);
+        struct bpf_prog *fp = container_of(work, struct bpf_prog, work);
         unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
         struct bpf_binary_header *header = (void *)addr;
 
@@ -941,7 +941,7 @@ static void bpf_jit_free_deferred(struct work_struct *work)
         kfree(fp);
 }
 
-void bpf_jit_free(struct sk_filter *fp)
+void bpf_jit_free(struct bpf_prog *fp)
 {
         if (fp->jited) {
                 INIT_WORK(&fp->work, bpf_jit_free_deferred);