bpf: rename bpf_parse_common() to bpf_parse_and_load_common()

bpf_parse_common() parses and loads the program.  Rename it
accordingly.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>

diff --git a/include/bpf_util.h b/include/bpf_util.h
index 8e39a2d489db871f0423ef2e871682c6b657f514..da2dee8bb3aa4dc8dfa689a72befa624383951c3 100644 (file)
--- a/include/bpf_util.h
+++ b/include/bpf_util.h
@@ -259,8 +259,8 @@ struct bpf_cfg_in {
                .off   = 0,                                     \
                .imm   = 0 })
 
-int bpf_parse_common(struct bpf_cfg_in *cfg, const struct bpf_cfg_ops *ops,
-                    void *nl);
+int bpf_parse_and_load_common(struct bpf_cfg_in *cfg,
+                             const struct bpf_cfg_ops *ops, void *nl);
 
 const char *bpf_prog_to_default_section(enum bpf_prog_type type);
 

diff --git a/ip/iplink_xdp.c b/ip/iplink_xdp.c
index 993e44d7878a756ffbeffa92cd4c2128cba30ad1..edaec2a250e79526895c7f226b5bdc21cfad7c09 100644 (file)
--- a/ip/iplink_xdp.c
+++ b/ip/iplink_xdp.c
@@ -75,7 +75,7 @@ int xdp_parse(int *argc, char ***argv, struct iplink_req *req, bool generic,
                        return xdp_delete(&xdp);
        }
 
-       if (bpf_parse_common(&cfg, &bpf_cb_ops, &xdp))
+       if (bpf_parse_and_load_common(&cfg, &bpf_cb_ops, &xdp))
                return -1;
 
        *argc = cfg.argc;

diff --git a/ip/iproute_lwtunnel.c b/ip/iproute_lwtunnel.c
index 62dc0cd8dffdf888172606d8fd7bfecc54c27329..740da7c6d884012c7a28e121b73eb3ab7f396851 100644 (file)
--- a/ip/iproute_lwtunnel.c
+++ b/ip/iproute_lwtunnel.c
@@ -898,7 +898,7 @@ static int lwt_parse_bpf(struct rtattr *rta, size_t len,
        int err;
 
        nest = rta_nest(rta, len, attr);
-       err = bpf_parse_common(&cfg, &bpf_cb_ops, &x);
+       err = bpf_parse_and_load_common(&cfg, &bpf_cb_ops, &x);
        if (err < 0) {
                fprintf(stderr, "Failed to parse eBPF program: %s\n",
                        strerror(-err));

diff --git a/lib/bpf.c b/lib/bpf.c
index 52f7c790065f029656ccabbd64877c880fc68912..9a0867124fc4fcbf049d0423e2f2c51ff1654883 100644 (file)
--- a/lib/bpf.c
+++ b/lib/bpf.c
@@ -953,8 +953,8 @@ static int bpf_parse_opt_tbl(struct bpf_cfg_in *cfg,
        return 0;
 }
 
-int bpf_parse_common(struct bpf_cfg_in *cfg, const struct bpf_cfg_ops *ops,
-                    void *nl)
+int bpf_parse_and_load_common(struct bpf_cfg_in *cfg,
+                             const struct bpf_cfg_ops *ops, void *nl)
 {
        bool opt_tbl[BPF_MODE_MAX] = {};
 

diff --git a/tc/f_bpf.c b/tc/f_bpf.c
index a38ec2ab7786d38cc99d2857555b4815d0398795..21ba759c4b01768b625cbc257dba520476262f59 100644 (file)
--- a/tc/f_bpf.c
+++ b/tc/f_bpf.c
@@ -107,7 +107,7 @@ opt_bpf:
                        cfg.argc = argc;
                        cfg.argv = argv;
 
-                       if (bpf_parse_common(&cfg, &bpf_cb_ops, n))
+                       if (bpf_parse_and_load_common(&cfg, &bpf_cb_ops, n))
                                return -1;
 
                        argc = cfg.argc;

diff --git a/tc/m_bpf.c b/tc/m_bpf.c
index f2ce3892e4ed6bef7ca44e62b0dcac5f66f697b4..e275afd01fb32ad1eda6b1dfcfcbe38d4f3c0e3b 100644 (file)
--- a/tc/m_bpf.c
+++ b/tc/m_bpf.c
@@ -102,7 +102,7 @@ opt_bpf:
                        cfg.argc = argc;
                        cfg.argv = argv;
 
-                       if (bpf_parse_common(&cfg, &bpf_cb_ops, n))
+                       if (bpf_parse_and_load_common(&cfg, &bpf_cb_ops, n))
                                return -1;
 
                        argc = cfg.argc;