Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

[linux-block.git] / net / core / filter.c

diff --git a/net/core/filter.c b/net/core/filter.c
index 8271624a19aac3ef3741e2d00bd354662aab0175..e4cc3aff5bf7054d887a4dd32fb77a94bf3a5a2a 100644 (file)
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -1242,10 +1242,9 @@ static struct bpf_prog *bpf_migrate_filter(struct bpf_prog *fp)
        int err, new_len, old_len = fp->len;
        bool seen_ld_abs = false;
 
-       /* We are free to overwrite insns et al right here as it
-        * won't be used at this point in time anymore internally
-        * after the migration to the internal BPF instruction
-        * representation.
+       /* We are free to overwrite insns et al right here as it won't be used at
+        * this point in time anymore internally after the migration to the eBPF
+        * instruction representation.
         */
        BUILD_BUG_ON(sizeof(struct sock_filter) !=
                     sizeof(struct bpf_insn));
@@ -1336,8 +1335,8 @@ static struct bpf_prog *bpf_prepare_filter(struct bpf_prog *fp,
         */
        bpf_jit_compile(fp);
 
-       /* JIT compiler couldn't process this filter, so do the
-        * internal BPF translation for the optimized interpreter.
+       /* JIT compiler couldn't process this filter, so do the eBPF translation
+        * for the optimized interpreter.
         */
        if (!fp->jited)
                fp = bpf_migrate_filter(fp);