devlink: rename netlink callback to be aligned with the generated ones

All remaining doit and dumpit netlink callback functions are going to be
used by generated split ops. They expect certain name format. Rename the
callback to be aligned with generated names.

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Link: https://lore.kernel.org/r/20231021112711.660606-8-jiri@resnulli.us
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/devlink/dev.c b/net/devlink/dev.c
index dc8039ca2b388bc360a6191910ee7848284445bf..4fc7adb3266316ffc4f7659e62c0b3d49185b971 100644 (file)
--- a/net/devlink/dev.c
+++ b/net/devlink/dev.c
@@ -492,7 +492,7 @@ free_msg:
        return -EMSGSIZE;
 }
 
-int devlink_nl_cmd_reload(struct sk_buff *skb, struct genl_info *info)
+int devlink_nl_reload_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
        enum devlink_reload_action action;
@@ -658,7 +658,7 @@ nla_put_failure:
        return err;
 }
 
-int devlink_nl_cmd_eswitch_get_doit(struct sk_buff *skb, struct genl_info *info)
+int devlink_nl_eswitch_get_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
        struct sk_buff *msg;
@@ -679,7 +679,7 @@ int devlink_nl_cmd_eswitch_get_doit(struct sk_buff *skb, struct genl_info *info)
        return genlmsg_reply(msg, info);
 }
 
-int devlink_nl_cmd_eswitch_set_doit(struct sk_buff *skb, struct genl_info *info)
+int devlink_nl_eswitch_set_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
        const struct devlink_ops *ops = devlink->ops;
@@ -1108,7 +1108,7 @@ static int devlink_flash_component_get(struct devlink *devlink,
        return 0;
 }
 
-int devlink_nl_cmd_flash_update(struct sk_buff *skb, struct genl_info *info)
+int devlink_nl_flash_update_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct nlattr *nla_overwrite_mask, *nla_file_name;
        struct devlink_flash_update_params params = {};
@@ -1351,7 +1351,7 @@ static const struct nla_policy devlink_selftest_nl_policy[DEVLINK_ATTR_SELFTEST_
        [DEVLINK_ATTR_SELFTEST_ID_FLASH] = { .type = NLA_FLAG },
 };
 
-int devlink_nl_cmd_selftests_run(struct sk_buff *skb, struct genl_info *info)
+int devlink_nl_selftests_run_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct nlattr *tb[DEVLINK_ATTR_SELFTEST_ID_MAX + 1];
        struct devlink *devlink = info->user_ptr[0];

diff --git a/net/devlink/devl_internal.h b/net/devlink/devl_internal.h
index 741d1bf1bec888087b01d1d99868d614bafd7641..daf4c696a61880113582178e4ceabcc9bc2a11ec 100644 (file)
--- a/net/devlink/devl_internal.h
+++ b/net/devlink/devl_internal.h
@@ -229,65 +229,63 @@ int devlink_rate_nodes_check(struct devlink *devlink, u16 mode,
 unsigned int devlink_linecard_index(struct devlink_linecard *linecard);
 
 /* Devlink nl cmds */
-int devlink_nl_cmd_reload(struct sk_buff *skb, struct genl_info *info);
-int devlink_nl_cmd_eswitch_get_doit(struct sk_buff *skb, struct genl_info *info);
-int devlink_nl_cmd_eswitch_set_doit(struct sk_buff *skb, struct genl_info *info);
-int devlink_nl_cmd_flash_update(struct sk_buff *skb, struct genl_info *info);
-int devlink_nl_cmd_selftests_run(struct sk_buff *skb, struct genl_info *info);
-int devlink_nl_cmd_port_set_doit(struct sk_buff *skb, struct genl_info *info);
-int devlink_nl_cmd_port_split_doit(struct sk_buff *skb, struct genl_info *info);
-int devlink_nl_cmd_port_unsplit_doit(struct sk_buff *skb,
+int devlink_nl_reload_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_eswitch_get_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_eswitch_set_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_flash_update_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_selftests_run_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_port_set_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_port_split_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_port_unsplit_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_port_new_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_port_del_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_sb_pool_set_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_sb_port_pool_set_doit(struct sk_buff *skb,
                                     struct genl_info *info);
-int devlink_nl_cmd_port_new_doit(struct sk_buff *skb, struct genl_info *info);
-int devlink_nl_cmd_port_del_doit(struct sk_buff *skb, struct genl_info *info);
-int devlink_nl_cmd_sb_pool_set_doit(struct sk_buff *skb, struct genl_info *info);
-int devlink_nl_cmd_sb_port_pool_set_doit(struct sk_buff *skb,
-                                        struct genl_info *info);
-int devlink_nl_cmd_sb_tc_pool_bind_set_doit(struct sk_buff *skb,
-                                           struct genl_info *info);
-int devlink_nl_cmd_sb_occ_snapshot_doit(struct sk_buff *skb,
+int devlink_nl_sb_tc_pool_bind_set_doit(struct sk_buff *skb,
                                        struct genl_info *info);
-int devlink_nl_cmd_sb_occ_max_clear_doit(struct sk_buff *skb,
-                                        struct genl_info *info);
-int devlink_nl_cmd_dpipe_table_get(struct sk_buff *skb, struct genl_info *info);
-int devlink_nl_cmd_dpipe_entries_get(struct sk_buff *skb,
-                                    struct genl_info *info);
-int devlink_nl_cmd_dpipe_headers_get(struct sk_buff *skb,
+int devlink_nl_sb_occ_snapshot_doit(struct sk_buff *skb,
+                                   struct genl_info *info);
+int devlink_nl_sb_occ_max_clear_doit(struct sk_buff *skb,
                                     struct genl_info *info);
-int devlink_nl_cmd_dpipe_table_counters_set(struct sk_buff *skb,
-                                           struct genl_info *info);
-int devlink_nl_cmd_resource_set(struct sk_buff *skb, struct genl_info *info);
-int devlink_nl_cmd_resource_dump(struct sk_buff *skb, struct genl_info *info);
-int devlink_nl_cmd_param_set_doit(struct sk_buff *skb, struct genl_info *info);
-int devlink_nl_cmd_port_param_get_dumpit(struct sk_buff *msg,
-                                        struct netlink_callback *cb);
-int devlink_nl_cmd_port_param_get_doit(struct sk_buff *skb,
-                                      struct genl_info *info);
-int devlink_nl_cmd_port_param_set_doit(struct sk_buff *skb,
-                                      struct genl_info *info);
-int devlink_nl_cmd_region_new(struct sk_buff *skb, struct genl_info *info);
-int devlink_nl_cmd_region_del(struct sk_buff *skb, struct genl_info *info);
-int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb,
-                                     struct netlink_callback *cb);
-int devlink_nl_cmd_health_reporter_set_doit(struct sk_buff *skb,
+int devlink_nl_dpipe_table_get_doit(struct sk_buff *skb,
+                                   struct genl_info *info);
+int devlink_nl_dpipe_entries_get_doit(struct sk_buff *skb,
+                                     struct genl_info *info);
+int devlink_nl_dpipe_headers_get_doit(struct sk_buff *skb,
+                                     struct genl_info *info);
+int devlink_nl_dpipe_table_counters_set_doit(struct sk_buff *skb,
+                                            struct genl_info *info);
+int devlink_nl_resource_set_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_resource_dump_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_param_set_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_port_param_get_dumpit(struct sk_buff *msg,
+                                    struct netlink_callback *cb);
+int devlink_nl_port_param_get_doit(struct sk_buff *skb,
+                                  struct genl_info *info);
+int devlink_nl_port_param_set_doit(struct sk_buff *skb,
+                                  struct genl_info *info);
+int devlink_nl_region_new_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_region_del_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_region_read_dumpit(struct sk_buff *skb,
+                                 struct netlink_callback *cb);
+int devlink_nl_health_reporter_set_doit(struct sk_buff *skb,
+                                       struct genl_info *info);
+int devlink_nl_health_reporter_recover_doit(struct sk_buff *skb,
                                            struct genl_info *info);
-int devlink_nl_cmd_health_reporter_recover_doit(struct sk_buff *skb,
-                                               struct genl_info *info);
-int devlink_nl_cmd_health_reporter_diagnose_doit(struct sk_buff *skb,
-                                                struct genl_info *info);
-int devlink_nl_cmd_health_reporter_dump_get_dumpit(struct sk_buff *skb,
-                                                  struct netlink_callback *cb);
-int devlink_nl_cmd_health_reporter_dump_clear_doit(struct sk_buff *skb,
-                                                  struct genl_info *info);
-int devlink_nl_cmd_health_reporter_test_doit(struct sk_buff *skb,
+int devlink_nl_health_reporter_diagnose_doit(struct sk_buff *skb,
                                             struct genl_info *info);
-int devlink_nl_cmd_trap_set_doit(struct sk_buff *skb, struct genl_info *info);
-int devlink_nl_cmd_trap_group_set_doit(struct sk_buff *skb,
-                                      struct genl_info *info);
-int devlink_nl_cmd_trap_policer_set_doit(struct sk_buff *skb,
+int devlink_nl_health_reporter_dump_get_dumpit(struct sk_buff *skb,
+                                              struct netlink_callback *cb);
+int devlink_nl_health_reporter_dump_clear_doit(struct sk_buff *skb,
+                                              struct genl_info *info);
+int devlink_nl_health_reporter_test_doit(struct sk_buff *skb,
                                         struct genl_info *info);
-int devlink_nl_cmd_rate_set_doit(struct sk_buff *skb, struct genl_info *info);
-int devlink_nl_cmd_rate_new_doit(struct sk_buff *skb, struct genl_info *info);
-int devlink_nl_cmd_rate_del_doit(struct sk_buff *skb, struct genl_info *info);
-int devlink_nl_cmd_linecard_set_doit(struct sk_buff *skb,
+int devlink_nl_trap_set_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_trap_group_set_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_trap_policer_set_doit(struct sk_buff *skb,
                                     struct genl_info *info);
+int devlink_nl_rate_set_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_rate_new_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_rate_del_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_linecard_set_doit(struct sk_buff *skb, struct genl_info *info);

diff --git a/net/devlink/dpipe.c b/net/devlink/dpipe.c
index 431227c412e5e97ef9b9084df9dca6a78a1aa5b0..a72a9292efc5cfc1a8548d04a7f404941a24874c 100644 (file)
--- a/net/devlink/dpipe.c
+++ b/net/devlink/dpipe.c
@@ -289,7 +289,7 @@ err_table_put:
        return err;
 }
 
-int devlink_nl_cmd_dpipe_table_get(struct sk_buff *skb, struct genl_info *info)
+int devlink_nl_dpipe_table_get_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
        const char *table_name =  NULL;
@@ -562,8 +562,8 @@ send_done:
        return genlmsg_reply(dump_ctx.skb, info);
 }
 
-int devlink_nl_cmd_dpipe_entries_get(struct sk_buff *skb,
-                                    struct genl_info *info)
+int devlink_nl_dpipe_entries_get_doit(struct sk_buff *skb,
+                                     struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
        struct devlink_dpipe_table *table;
@@ -712,8 +712,8 @@ err_table_put:
        return err;
 }
 
-int devlink_nl_cmd_dpipe_headers_get(struct sk_buff *skb,
-                                    struct genl_info *info)
+int devlink_nl_dpipe_headers_get_doit(struct sk_buff *skb,
+                                     struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
 
@@ -746,8 +746,8 @@ static int devlink_dpipe_table_counters_set(struct devlink *devlink,
        return 0;
 }
 
-int devlink_nl_cmd_dpipe_table_counters_set(struct sk_buff *skb,
-                                           struct genl_info *info)
+int devlink_nl_dpipe_table_counters_set_doit(struct sk_buff *skb,
+                                            struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
        const char *table_name;

diff --git a/net/devlink/health.c b/net/devlink/health.c
index 89405e59f45ca091653aa98b9649cd8649a9f542..695df61f8ac2a5de13f70d29c42c6d0a652c1b97 100644 (file)
--- a/net/devlink/health.c
+++ b/net/devlink/health.c
@@ -452,8 +452,8 @@ int devlink_nl_health_reporter_get_dumpit(struct sk_buff *skb,
                                 devlink_nl_health_reporter_get_dump_one);
 }
 
-int devlink_nl_cmd_health_reporter_set_doit(struct sk_buff *skb,
-                                           struct genl_info *info)
+int devlink_nl_health_reporter_set_doit(struct sk_buff *skb,
+                                       struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
        struct devlink_health_reporter *reporter;
@@ -655,8 +655,8 @@ devlink_health_reporter_state_update(struct devlink_health_reporter *reporter,
 }
 EXPORT_SYMBOL_GPL(devlink_health_reporter_state_update);
 
-int devlink_nl_cmd_health_reporter_recover_doit(struct sk_buff *skb,
-                                               struct genl_info *info)
+int devlink_nl_health_reporter_recover_doit(struct sk_buff *skb,
+                                           struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
        struct devlink_health_reporter *reporter;
@@ -1108,8 +1108,8 @@ nla_put_failure:
        return err;
 }
 
-int devlink_nl_cmd_health_reporter_diagnose_doit(struct sk_buff *skb,
-                                                struct genl_info *info)
+int devlink_nl_health_reporter_diagnose_doit(struct sk_buff *skb,
+                                            struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
        struct devlink_health_reporter *reporter;
@@ -1163,8 +1163,8 @@ devlink_health_reporter_get_from_cb_lock(struct netlink_callback *cb)
        return reporter;
 }
 
-int devlink_nl_cmd_health_reporter_dump_get_dumpit(struct sk_buff *skb,
-                                                  struct netlink_callback *cb)
+int devlink_nl_health_reporter_dump_get_dumpit(struct sk_buff *skb,
+                                              struct netlink_callback *cb)
 {
        struct devlink_nl_dump_state *state = devlink_dump_state(cb);
        struct devlink_health_reporter *reporter;
@@ -1202,8 +1202,8 @@ unlock:
        return err;
 }
 
-int devlink_nl_cmd_health_reporter_dump_clear_doit(struct sk_buff *skb,
-                                                  struct genl_info *info)
+int devlink_nl_health_reporter_dump_clear_doit(struct sk_buff *skb,
+                                              struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
        struct devlink_health_reporter *reporter;
@@ -1219,8 +1219,8 @@ int devlink_nl_cmd_health_reporter_dump_clear_doit(struct sk_buff *skb,
        return 0;
 }
 
-int devlink_nl_cmd_health_reporter_test_doit(struct sk_buff *skb,
-                                            struct genl_info *info)
+int devlink_nl_health_reporter_test_doit(struct sk_buff *skb,
+                                        struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
        struct devlink_health_reporter *reporter;

diff --git a/net/devlink/linecard.c b/net/devlink/linecard.c
index 9ff1813f88c55cb0136fc74828bab358009fed61..2f1c317b64cd8c1b0c5a32f70b5484104ce07eb1 100644 (file)
--- a/net/devlink/linecard.c
+++ b/net/devlink/linecard.c
@@ -369,8 +369,7 @@ out:
        return err;
 }
 
-int devlink_nl_cmd_linecard_set_doit(struct sk_buff *skb,
-                                    struct genl_info *info)
+int devlink_nl_linecard_set_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct netlink_ext_ack *extack = info->extack;
        struct devlink *devlink = info->user_ptr[0];

diff --git a/net/devlink/netlink.c b/net/devlink/netlink.c
index 809bfc3ba8c4d4ac05951a6c7d45b8f7d08598f1..ca63e59a5e92061ea88e85f4e65b6c3d57666d20 100644 (file)
--- a/net/devlink/netlink.c
+++ b/net/devlink/netlink.c
@@ -291,200 +291,200 @@ static const struct genl_small_ops devlink_nl_small_ops[40] = {
        {
                .cmd = DEVLINK_CMD_PORT_SET,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_port_set_doit,
+               .doit = devlink_nl_port_set_doit,
                .flags = GENL_ADMIN_PERM,
                .internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
        },
        {
                .cmd = DEVLINK_CMD_RATE_SET,
-               .doit = devlink_nl_cmd_rate_set_doit,
+               .doit = devlink_nl_rate_set_doit,
                .flags = GENL_ADMIN_PERM,
        },
        {
                .cmd = DEVLINK_CMD_RATE_NEW,
-               .doit = devlink_nl_cmd_rate_new_doit,
+               .doit = devlink_nl_rate_new_doit,
                .flags = GENL_ADMIN_PERM,
        },
        {
                .cmd = DEVLINK_CMD_RATE_DEL,
-               .doit = devlink_nl_cmd_rate_del_doit,
+               .doit = devlink_nl_rate_del_doit,
                .flags = GENL_ADMIN_PERM,
        },
        {
                .cmd = DEVLINK_CMD_PORT_SPLIT,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_port_split_doit,
+               .doit = devlink_nl_port_split_doit,
                .flags = GENL_ADMIN_PERM,
                .internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
        },
        {
                .cmd = DEVLINK_CMD_PORT_UNSPLIT,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_port_unsplit_doit,
+               .doit = devlink_nl_port_unsplit_doit,
                .flags = GENL_ADMIN_PERM,
                .internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
        },
        {
                .cmd = DEVLINK_CMD_PORT_NEW,
-               .doit = devlink_nl_cmd_port_new_doit,
+               .doit = devlink_nl_port_new_doit,
                .flags = GENL_ADMIN_PERM,
        },
        {
                .cmd = DEVLINK_CMD_PORT_DEL,
-               .doit = devlink_nl_cmd_port_del_doit,
+               .doit = devlink_nl_port_del_doit,
                .flags = GENL_ADMIN_PERM,
                .internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
        },
 
        {
                .cmd = DEVLINK_CMD_LINECARD_SET,
-               .doit = devlink_nl_cmd_linecard_set_doit,
+               .doit = devlink_nl_linecard_set_doit,
                .flags = GENL_ADMIN_PERM,
        },
        {
                .cmd = DEVLINK_CMD_SB_POOL_SET,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_sb_pool_set_doit,
+               .doit = devlink_nl_sb_pool_set_doit,
                .flags = GENL_ADMIN_PERM,
        },
        {
                .cmd = DEVLINK_CMD_SB_PORT_POOL_SET,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_sb_port_pool_set_doit,
+               .doit = devlink_nl_sb_port_pool_set_doit,
                .flags = GENL_ADMIN_PERM,
                .internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
        },
        {
                .cmd = DEVLINK_CMD_SB_TC_POOL_BIND_SET,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_sb_tc_pool_bind_set_doit,
+               .doit = devlink_nl_sb_tc_pool_bind_set_doit,
                .flags = GENL_ADMIN_PERM,
                .internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
        },
        {
                .cmd = DEVLINK_CMD_SB_OCC_SNAPSHOT,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_sb_occ_snapshot_doit,
+               .doit = devlink_nl_sb_occ_snapshot_doit,
                .flags = GENL_ADMIN_PERM,
        },
        {
                .cmd = DEVLINK_CMD_SB_OCC_MAX_CLEAR,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_sb_occ_max_clear_doit,
+               .doit = devlink_nl_sb_occ_max_clear_doit,
                .flags = GENL_ADMIN_PERM,
        },
        {
                .cmd = DEVLINK_CMD_ESWITCH_GET,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_eswitch_get_doit,
+               .doit = devlink_nl_eswitch_get_doit,
                .flags = GENL_ADMIN_PERM,
        },
        {
                .cmd = DEVLINK_CMD_ESWITCH_SET,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_eswitch_set_doit,
+               .doit = devlink_nl_eswitch_set_doit,
                .flags = GENL_ADMIN_PERM,
        },
        {
                .cmd = DEVLINK_CMD_DPIPE_TABLE_GET,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_dpipe_table_get,
+               .doit = devlink_nl_dpipe_table_get_doit,
                /* can be retrieved by unprivileged users */
        },
        {
                .cmd = DEVLINK_CMD_DPIPE_ENTRIES_GET,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_dpipe_entries_get,
+               .doit = devlink_nl_dpipe_entries_get_doit,
                /* can be retrieved by unprivileged users */
        },
        {
                .cmd = DEVLINK_CMD_DPIPE_HEADERS_GET,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_dpipe_headers_get,
+               .doit = devlink_nl_dpipe_headers_get_doit,
                /* can be retrieved by unprivileged users */
        },
        {
                .cmd = DEVLINK_CMD_DPIPE_TABLE_COUNTERS_SET,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_dpipe_table_counters_set,
+               .doit = devlink_nl_dpipe_table_counters_set_doit,
                .flags = GENL_ADMIN_PERM,
        },
        {
                .cmd = DEVLINK_CMD_RESOURCE_SET,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_resource_set,
+               .doit = devlink_nl_resource_set_doit,
                .flags = GENL_ADMIN_PERM,
        },
        {
                .cmd = DEVLINK_CMD_RESOURCE_DUMP,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_resource_dump,
+               .doit = devlink_nl_resource_dump_doit,
                /* can be retrieved by unprivileged users */
        },
        {
                .cmd = DEVLINK_CMD_RELOAD,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_reload,
+               .doit = devlink_nl_reload_doit,
                .flags = GENL_ADMIN_PERM,
        },
        {
                .cmd = DEVLINK_CMD_PARAM_SET,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_param_set_doit,
+               .doit = devlink_nl_param_set_doit,
                .flags = GENL_ADMIN_PERM,
        },
        {
                .cmd = DEVLINK_CMD_PORT_PARAM_GET,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_port_param_get_doit,
-               .dumpit = devlink_nl_cmd_port_param_get_dumpit,
+               .doit = devlink_nl_port_param_get_doit,
+               .dumpit = devlink_nl_port_param_get_dumpit,
                .internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
                /* can be retrieved by unprivileged users */
        },
        {
                .cmd = DEVLINK_CMD_PORT_PARAM_SET,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_port_param_set_doit,
+               .doit = devlink_nl_port_param_set_doit,
                .flags = GENL_ADMIN_PERM,
                .internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
        },
        {
                .cmd = DEVLINK_CMD_REGION_NEW,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_region_new,
+               .doit = devlink_nl_region_new_doit,
                .flags = GENL_ADMIN_PERM,
        },
        {
                .cmd = DEVLINK_CMD_REGION_DEL,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_region_del,
+               .doit = devlink_nl_region_del_doit,
                .flags = GENL_ADMIN_PERM,
        },
        {
                .cmd = DEVLINK_CMD_REGION_READ,
                .validate = GENL_DONT_VALIDATE_STRICT |
                            GENL_DONT_VALIDATE_DUMP_STRICT,
-               .dumpit = devlink_nl_cmd_region_read_dumpit,
+               .dumpit = devlink_nl_region_read_dumpit,
                .flags = GENL_ADMIN_PERM,
        },
        {
                .cmd = DEVLINK_CMD_HEALTH_REPORTER_SET,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_health_reporter_set_doit,
+               .doit = devlink_nl_health_reporter_set_doit,
                .flags = GENL_ADMIN_PERM,
                .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT,
        },
        {
                .cmd = DEVLINK_CMD_HEALTH_REPORTER_RECOVER,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_health_reporter_recover_doit,
+               .doit = devlink_nl_health_reporter_recover_doit,
                .flags = GENL_ADMIN_PERM,
                .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT,
        },
        {
                .cmd = DEVLINK_CMD_HEALTH_REPORTER_DIAGNOSE,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_health_reporter_diagnose_doit,
+               .doit = devlink_nl_health_reporter_diagnose_doit,
                .flags = GENL_ADMIN_PERM,
                .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT,
        },
@@ -492,47 +492,47 @@ static const struct genl_small_ops devlink_nl_small_ops[40] = {
                .cmd = DEVLINK_CMD_HEALTH_REPORTER_DUMP_GET,
                .validate = GENL_DONT_VALIDATE_STRICT |
                            GENL_DONT_VALIDATE_DUMP_STRICT,
-               .dumpit = devlink_nl_cmd_health_reporter_dump_get_dumpit,
+               .dumpit = devlink_nl_health_reporter_dump_get_dumpit,
                .flags = GENL_ADMIN_PERM,
        },
        {
                .cmd = DEVLINK_CMD_HEALTH_REPORTER_DUMP_CLEAR,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_health_reporter_dump_clear_doit,
+               .doit = devlink_nl_health_reporter_dump_clear_doit,
                .flags = GENL_ADMIN_PERM,
                .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT,
        },
        {
                .cmd = DEVLINK_CMD_HEALTH_REPORTER_TEST,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_health_reporter_test_doit,
+               .doit = devlink_nl_health_reporter_test_doit,
                .flags = GENL_ADMIN_PERM,
                .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT,
        },
        {
                .cmd = DEVLINK_CMD_FLASH_UPDATE,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_flash_update,
+               .doit = devlink_nl_flash_update_doit,
                .flags = GENL_ADMIN_PERM,
        },
        {
                .cmd = DEVLINK_CMD_TRAP_SET,
-               .doit = devlink_nl_cmd_trap_set_doit,
+               .doit = devlink_nl_trap_set_doit,
                .flags = GENL_ADMIN_PERM,
        },
        {
                .cmd = DEVLINK_CMD_TRAP_GROUP_SET,
-               .doit = devlink_nl_cmd_trap_group_set_doit,
+               .doit = devlink_nl_trap_group_set_doit,
                .flags = GENL_ADMIN_PERM,
        },
        {
                .cmd = DEVLINK_CMD_TRAP_POLICER_SET,
-               .doit = devlink_nl_cmd_trap_policer_set_doit,
+               .doit = devlink_nl_trap_policer_set_doit,
                .flags = GENL_ADMIN_PERM,
        },
        {
                .cmd = DEVLINK_CMD_SELFTESTS_RUN,
-               .doit = devlink_nl_cmd_selftests_run,
+               .doit = devlink_nl_selftests_run_doit,
                .flags = GENL_ADMIN_PERM,
        },
        /* -- No new ops here! Use split ops going forward! -- */

diff --git a/net/devlink/param.c b/net/devlink/param.c
index 31275f9d4cb73ab723134dbdd6e6a5661cf06f0d..d74df09311a9a1f09aed7fea9e6bde23d3abb4d4 100644 (file)
--- a/net/devlink/param.c
+++ b/net/devlink/param.c
@@ -581,7 +581,7 @@ static int __devlink_nl_cmd_param_set_doit(struct devlink *devlink,
        return 0;
 }
 
-int devlink_nl_cmd_param_set_doit(struct sk_buff *skb, struct genl_info *info)
+int devlink_nl_param_set_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
 
@@ -589,22 +589,22 @@ int devlink_nl_cmd_param_set_doit(struct sk_buff *skb, struct genl_info *info)
                                               info, DEVLINK_CMD_PARAM_NEW);
 }
 
-int devlink_nl_cmd_port_param_get_dumpit(struct sk_buff *msg,
-                                        struct netlink_callback *cb)
+int devlink_nl_port_param_get_dumpit(struct sk_buff *msg,
+                                    struct netlink_callback *cb)
 {
        NL_SET_ERR_MSG(cb->extack, "Port params are not supported");
        return msg->len;
 }
 
-int devlink_nl_cmd_port_param_get_doit(struct sk_buff *skb,
-                                      struct genl_info *info)
+int devlink_nl_port_param_get_doit(struct sk_buff *skb,
+                                  struct genl_info *info)
 {
        NL_SET_ERR_MSG(info->extack, "Port params are not supported");
        return -EINVAL;
 }
 
-int devlink_nl_cmd_port_param_set_doit(struct sk_buff *skb,
-                                      struct genl_info *info)
+int devlink_nl_port_param_set_doit(struct sk_buff *skb,
+                                  struct genl_info *info)
 {
        NL_SET_ERR_MSG(info->extack, "Port params are not supported");
        return -EINVAL;

diff --git a/net/devlink/port.c b/net/devlink/port.c
index 4e9003242448920689c22e330148e052570ac947..7634f187fa5055e9db15cb72b0e93ce7070eddbf 100644 (file)
--- a/net/devlink/port.c
+++ b/net/devlink/port.c
@@ -772,7 +772,7 @@ static int devlink_port_function_set(struct devlink_port *port,
        return err;
 }
 
-int devlink_nl_cmd_port_set_doit(struct sk_buff *skb, struct genl_info *info)
+int devlink_nl_port_set_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct devlink_port *devlink_port = info->user_ptr[1];
        int err;
@@ -798,7 +798,7 @@ int devlink_nl_cmd_port_set_doit(struct sk_buff *skb, struct genl_info *info)
        return 0;
 }
 
-int devlink_nl_cmd_port_split_doit(struct sk_buff *skb, struct genl_info *info)
+int devlink_nl_port_split_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct devlink_port *devlink_port = info->user_ptr[1];
        struct devlink *devlink = info->user_ptr[0];
@@ -829,8 +829,7 @@ int devlink_nl_cmd_port_split_doit(struct sk_buff *skb, struct genl_info *info)
                                             info->extack);
 }
 
-int devlink_nl_cmd_port_unsplit_doit(struct sk_buff *skb,
-                                    struct genl_info *info)
+int devlink_nl_port_unsplit_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct devlink_port *devlink_port = info->user_ptr[1];
        struct devlink *devlink = info->user_ptr[0];
@@ -840,7 +839,7 @@ int devlink_nl_cmd_port_unsplit_doit(struct sk_buff *skb,
        return devlink_port->ops->port_unsplit(devlink, devlink_port, info->extack);
 }
 
-int devlink_nl_cmd_port_new_doit(struct sk_buff *skb, struct genl_info *info)
+int devlink_nl_port_new_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct netlink_ext_ack *extack = info->extack;
        struct devlink_port_new_attrs new_attrs = {};
@@ -904,7 +903,7 @@ err_out_port_del:
        return err;
 }
 
-int devlink_nl_cmd_port_del_doit(struct sk_buff *skb, struct genl_info *info)
+int devlink_nl_port_del_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct devlink_port *devlink_port = info->user_ptr[1];
        struct netlink_ext_ack *extack = info->extack;

diff --git a/net/devlink/rate.c b/net/devlink/rate.c
index dff1593b8406ac7ad46ebb768f18ffe7ca16329b..94b289b93ff285128fd834f8c70cceea1fd4e0fa 100644 (file)
--- a/net/devlink/rate.c
+++ b/net/devlink/rate.c
@@ -458,7 +458,7 @@ static bool devlink_rate_set_ops_supported(const struct devlink_ops *ops,
        return true;
 }
 
-int devlink_nl_cmd_rate_set_doit(struct sk_buff *skb, struct genl_info *info)
+int devlink_nl_rate_set_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
        struct devlink_rate *devlink_rate;
@@ -480,7 +480,7 @@ int devlink_nl_cmd_rate_set_doit(struct sk_buff *skb, struct genl_info *info)
        return err;
 }
 
-int devlink_nl_cmd_rate_new_doit(struct sk_buff *skb, struct genl_info *info)
+int devlink_nl_rate_new_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
        struct devlink_rate *rate_node;
@@ -536,7 +536,7 @@ err_strdup:
        return err;
 }
 
-int devlink_nl_cmd_rate_del_doit(struct sk_buff *skb, struct genl_info *info)
+int devlink_nl_rate_del_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
        struct devlink_rate *rate_node;

diff --git a/net/devlink/region.c b/net/devlink/region.c
index d197cdb662dbd455386370e22ae80c3efcb4d349..0aab7b82d67800bb2168c80147577a7f0c4260f2 100644 (file)
--- a/net/devlink/region.c
+++ b/net/devlink/region.c
@@ -588,7 +588,7 @@ int devlink_nl_region_get_dumpit(struct sk_buff *skb,
        return devlink_nl_dumpit(skb, cb, devlink_nl_region_get_dump_one);
 }
 
-int devlink_nl_cmd_region_del(struct sk_buff *skb, struct genl_info *info)
+int devlink_nl_region_del_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
        struct devlink_snapshot *snapshot;
@@ -633,7 +633,7 @@ int devlink_nl_cmd_region_del(struct sk_buff *skb, struct genl_info *info)
        return 0;
 }
 
-int devlink_nl_cmd_region_new(struct sk_buff *skb, struct genl_info *info)
+int devlink_nl_region_new_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
        struct devlink_snapshot *snapshot;
@@ -863,8 +863,8 @@ devlink_region_direct_fill(void *cb_priv, u8 *chunk, u32 chunk_size,
                                 curr_offset, chunk_size, chunk);
 }
 
-int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb,
-                                     struct netlink_callback *cb)
+int devlink_nl_region_read_dumpit(struct sk_buff *skb,
+                                 struct netlink_callback *cb)
 {
        const struct genl_dumpit_info *info = genl_dumpit_info(cb);
        struct devlink_nl_dump_state *state = devlink_dump_state(cb);

diff --git a/net/devlink/resource.c b/net/devlink/resource.c
index c8b615e4c385096212a567d57a6a2e46bc04ee5e..594c8aeb3bfa015f1296a3f1c8c362664a266418 100644 (file)
--- a/net/devlink/resource.c
+++ b/net/devlink/resource.c
@@ -105,7 +105,7 @@ devlink_resource_validate_size(struct devlink_resource *resource, u64 size,
        return err;
 }
 
-int devlink_nl_cmd_resource_set(struct sk_buff *skb, struct genl_info *info)
+int devlink_nl_resource_set_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
        struct devlink_resource *resource;
@@ -285,7 +285,7 @@ err_resource_put:
        return err;
 }
 
-int devlink_nl_cmd_resource_dump(struct sk_buff *skb, struct genl_info *info)
+int devlink_nl_resource_dump_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
 

diff --git a/net/devlink/sb.c b/net/devlink/sb.c
index bd677fff5ec8ff71087a316d93f4b7be5baa8468..0a76bb32502bdd4cf890cc6fe3f8d40448e2b8ef 100644 (file)
--- a/net/devlink/sb.c
+++ b/net/devlink/sb.c
@@ -413,7 +413,7 @@ static int devlink_sb_pool_set(struct devlink *devlink, unsigned int sb_index,
        return -EOPNOTSUPP;
 }
 
-int devlink_nl_cmd_sb_pool_set_doit(struct sk_buff *skb, struct genl_info *info)
+int devlink_nl_sb_pool_set_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
        enum devlink_sb_threshold_type threshold_type;
@@ -621,8 +621,8 @@ static int devlink_sb_port_pool_set(struct devlink_port *devlink_port,
        return -EOPNOTSUPP;
 }
 
-int devlink_nl_cmd_sb_port_pool_set_doit(struct sk_buff *skb,
-                                        struct genl_info *info)
+int devlink_nl_sb_port_pool_set_doit(struct sk_buff *skb,
+                                    struct genl_info *info)
 {
        struct devlink_port *devlink_port = info->user_ptr[1];
        struct devlink *devlink = info->user_ptr[0];
@@ -861,8 +861,8 @@ static int devlink_sb_tc_pool_bind_set(struct devlink_port *devlink_port,
        return -EOPNOTSUPP;
 }
 
-int devlink_nl_cmd_sb_tc_pool_bind_set_doit(struct sk_buff *skb,
-                                           struct genl_info *info)
+int devlink_nl_sb_tc_pool_bind_set_doit(struct sk_buff *skb,
+                                       struct genl_info *info)
 {
        struct devlink_port *devlink_port = info->user_ptr[1];
        struct devlink *devlink = info->user_ptr[0];
@@ -900,8 +900,7 @@ int devlink_nl_cmd_sb_tc_pool_bind_set_doit(struct sk_buff *skb,
                                           pool_index, threshold, info->extack);
 }
 
-int devlink_nl_cmd_sb_occ_snapshot_doit(struct sk_buff *skb,
-                                       struct genl_info *info)
+int devlink_nl_sb_occ_snapshot_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
        const struct devlink_ops *ops = devlink->ops;
@@ -916,8 +915,8 @@ int devlink_nl_cmd_sb_occ_snapshot_doit(struct sk_buff *skb,
        return -EOPNOTSUPP;
 }
 
-int devlink_nl_cmd_sb_occ_max_clear_doit(struct sk_buff *skb,
-                                        struct genl_info *info)
+int devlink_nl_sb_occ_max_clear_doit(struct sk_buff *skb,
+                                    struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
        const struct devlink_ops *ops = devlink->ops;

diff --git a/net/devlink/trap.c b/net/devlink/trap.c
index c26bf9b29bca264b42aa173e559213160404c030..c26313e7ca08ba1f7bad9d43db64e355024c6bea 100644 (file)
--- a/net/devlink/trap.c
+++ b/net/devlink/trap.c
@@ -414,7 +414,7 @@ static int devlink_trap_action_set(struct devlink *devlink,
                                         info->extack);
 }
 
-int devlink_nl_cmd_trap_set_doit(struct sk_buff *skb, struct genl_info *info)
+int devlink_nl_trap_set_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct netlink_ext_ack *extack = info->extack;
        struct devlink *devlink = info->user_ptr[0];
@@ -684,8 +684,7 @@ static int devlink_trap_group_set(struct devlink *devlink,
        return 0;
 }
 
-int devlink_nl_cmd_trap_group_set_doit(struct sk_buff *skb,
-                                      struct genl_info *info)
+int devlink_nl_trap_group_set_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct netlink_ext_ack *extack = info->extack;
        struct devlink *devlink = info->user_ptr[0];
@@ -926,8 +925,8 @@ devlink_trap_policer_set(struct devlink *devlink,
        return 0;
 }
 
-int devlink_nl_cmd_trap_policer_set_doit(struct sk_buff *skb,
-                                        struct genl_info *info)
+int devlink_nl_trap_policer_set_doit(struct sk_buff *skb,
+                                    struct genl_info *info)
 {
        struct devlink_trap_policer_item *policer_item;
        struct netlink_ext_ack *extack = info->extack;