Skip to content

Commit 5359093

Browse files
Jiri Pirkokuba-moo
Jiri Pirko
authored and
kuba-moo
committed
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 <[email protected]> Reviewed-by: Jacob Keller <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent e3570f0 commit 5359093

File tree

13 files changed

+152
-158
lines changed

13 files changed

+152
-158
lines changed

‎net/devlink/dev.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ devlink_nl_reload_actions_performed_snd(struct devlink *devlink, u32 actions_per
492492
return -EMSGSIZE;
493493
}
494494

495-
int devlink_nl_cmd_reload(struct sk_buff *skb, struct genl_info *info)
495+
int devlink_nl_reload_doit(struct sk_buff *skb, struct genl_info *info)
496496
{
497497
struct devlink *devlink = info->user_ptr[0];
498498
enum devlink_reload_action action;
@@ -658,7 +658,7 @@ static int devlink_nl_eswitch_fill(struct sk_buff *msg, struct devlink *devlink,
658658
return err;
659659
}
660660

661-
int devlink_nl_cmd_eswitch_get_doit(struct sk_buff *skb, struct genl_info *info)
661+
int devlink_nl_eswitch_get_doit(struct sk_buff *skb, struct genl_info *info)
662662
{
663663
struct devlink *devlink = info->user_ptr[0];
664664
struct sk_buff *msg;
@@ -679,7 +679,7 @@ int devlink_nl_cmd_eswitch_get_doit(struct sk_buff *skb, struct genl_info *info)
679679
return genlmsg_reply(msg, info);
680680
}
681681

682-
int devlink_nl_cmd_eswitch_set_doit(struct sk_buff *skb, struct genl_info *info)
682+
int devlink_nl_eswitch_set_doit(struct sk_buff *skb, struct genl_info *info)
683683
{
684684
struct devlink *devlink = info->user_ptr[0];
685685
const struct devlink_ops *ops = devlink->ops;
@@ -1108,7 +1108,7 @@ static int devlink_flash_component_get(struct devlink *devlink,
11081108
return 0;
11091109
}
11101110

1111-
int devlink_nl_cmd_flash_update(struct sk_buff *skb, struct genl_info *info)
1111+
int devlink_nl_flash_update_doit(struct sk_buff *skb, struct genl_info *info)
11121112
{
11131113
struct nlattr *nla_overwrite_mask, *nla_file_name;
11141114
struct devlink_flash_update_params params = {};
@@ -1351,7 +1351,7 @@ static const struct nla_policy devlink_selftest_nl_policy[DEVLINK_ATTR_SELFTEST_
13511351
[DEVLINK_ATTR_SELFTEST_ID_FLASH] = { .type = NLA_FLAG },
13521352
};
13531353

1354-
int devlink_nl_cmd_selftests_run(struct sk_buff *skb, struct genl_info *info)
1354+
int devlink_nl_selftests_run_doit(struct sk_buff *skb, struct genl_info *info)
13551355
{
13561356
struct nlattr *tb[DEVLINK_ATTR_SELFTEST_ID_MAX + 1];
13571357
struct devlink *devlink = info->user_ptr[0];

‎net/devlink/devl_internal.h

Lines changed: 53 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -229,65 +229,63 @@ int devlink_rate_nodes_check(struct devlink *devlink, u16 mode,
229229
unsigned int devlink_linecard_index(struct devlink_linecard *linecard);
230230

231231
/* Devlink nl cmds */
232-
int devlink_nl_cmd_reload(struct sk_buff *skb, struct genl_info *info);
233-
int devlink_nl_cmd_eswitch_get_doit(struct sk_buff *skb, struct genl_info *info);
234-
int devlink_nl_cmd_eswitch_set_doit(struct sk_buff *skb, struct genl_info *info);
235-
int devlink_nl_cmd_flash_update(struct sk_buff *skb, struct genl_info *info);
236-
int devlink_nl_cmd_selftests_run(struct sk_buff *skb, struct genl_info *info);
237-
int devlink_nl_cmd_port_set_doit(struct sk_buff *skb, struct genl_info *info);
238-
int devlink_nl_cmd_port_split_doit(struct sk_buff *skb, struct genl_info *info);
239-
int devlink_nl_cmd_port_unsplit_doit(struct sk_buff *skb,
232+
int devlink_nl_reload_doit(struct sk_buff *skb, struct genl_info *info);
233+
int devlink_nl_eswitch_get_doit(struct sk_buff *skb, struct genl_info *info);
234+
int devlink_nl_eswitch_set_doit(struct sk_buff *skb, struct genl_info *info);
235+
int devlink_nl_flash_update_doit(struct sk_buff *skb, struct genl_info *info);
236+
int devlink_nl_selftests_run_doit(struct sk_buff *skb, struct genl_info *info);
237+
int devlink_nl_port_set_doit(struct sk_buff *skb, struct genl_info *info);
238+
int devlink_nl_port_split_doit(struct sk_buff *skb, struct genl_info *info);
239+
int devlink_nl_port_unsplit_doit(struct sk_buff *skb, struct genl_info *info);
240+
int devlink_nl_port_new_doit(struct sk_buff *skb, struct genl_info *info);
241+
int devlink_nl_port_del_doit(struct sk_buff *skb, struct genl_info *info);
242+
int devlink_nl_sb_pool_set_doit(struct sk_buff *skb, struct genl_info *info);
243+
int devlink_nl_sb_port_pool_set_doit(struct sk_buff *skb,
240244
struct genl_info *info);
241-
int devlink_nl_cmd_port_new_doit(struct sk_buff *skb, struct genl_info *info);
242-
int devlink_nl_cmd_port_del_doit(struct sk_buff *skb, struct genl_info *info);
243-
int devlink_nl_cmd_sb_pool_set_doit(struct sk_buff *skb, struct genl_info *info);
244-
int devlink_nl_cmd_sb_port_pool_set_doit(struct sk_buff *skb,
245-
struct genl_info *info);
246-
int devlink_nl_cmd_sb_tc_pool_bind_set_doit(struct sk_buff *skb,
247-
struct genl_info *info);
248-
int devlink_nl_cmd_sb_occ_snapshot_doit(struct sk_buff *skb,
245+
int devlink_nl_sb_tc_pool_bind_set_doit(struct sk_buff *skb,
249246
struct genl_info *info);
250-
int devlink_nl_cmd_sb_occ_max_clear_doit(struct sk_buff *skb,
251-
struct genl_info *info);
252-
int devlink_nl_cmd_dpipe_table_get(struct sk_buff *skb, struct genl_info *info);
253-
int devlink_nl_cmd_dpipe_entries_get(struct sk_buff *skb,
254-
struct genl_info *info);
255-
int devlink_nl_cmd_dpipe_headers_get(struct sk_buff *skb,
247+
int devlink_nl_sb_occ_snapshot_doit(struct sk_buff *skb,
248+
struct genl_info *info);
249+
int devlink_nl_sb_occ_max_clear_doit(struct sk_buff *skb,
256250
struct genl_info *info);
257-
int devlink_nl_cmd_dpipe_table_counters_set(struct sk_buff *skb,
258-
struct genl_info *info);
259-
int devlink_nl_cmd_resource_set(struct sk_buff *skb, struct genl_info *info);
260-
int devlink_nl_cmd_resource_dump(struct sk_buff *skb, struct genl_info *info);
261-
int devlink_nl_cmd_param_set_doit(struct sk_buff *skb, struct genl_info *info);
262-
int devlink_nl_cmd_port_param_get_dumpit(struct sk_buff *msg,
263-
struct netlink_callback *cb);
264-
int devlink_nl_cmd_port_param_get_doit(struct sk_buff *skb,
265-
struct genl_info *info);
266-
int devlink_nl_cmd_port_param_set_doit(struct sk_buff *skb,
267-
struct genl_info *info);
268-
int devlink_nl_cmd_region_new(struct sk_buff *skb, struct genl_info *info);
269-
int devlink_nl_cmd_region_del(struct sk_buff *skb, struct genl_info *info);
270-
int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb,
271-
struct netlink_callback *cb);
272-
int devlink_nl_cmd_health_reporter_set_doit(struct sk_buff *skb,
251+
int devlink_nl_dpipe_table_get_doit(struct sk_buff *skb,
252+
struct genl_info *info);
253+
int devlink_nl_dpipe_entries_get_doit(struct sk_buff *skb,
254+
struct genl_info *info);
255+
int devlink_nl_dpipe_headers_get_doit(struct sk_buff *skb,
256+
struct genl_info *info);
257+
int devlink_nl_dpipe_table_counters_set_doit(struct sk_buff *skb,
258+
struct genl_info *info);
259+
int devlink_nl_resource_set_doit(struct sk_buff *skb, struct genl_info *info);
260+
int devlink_nl_resource_dump_doit(struct sk_buff *skb, struct genl_info *info);
261+
int devlink_nl_param_set_doit(struct sk_buff *skb, struct genl_info *info);
262+
int devlink_nl_port_param_get_dumpit(struct sk_buff *msg,
263+
struct netlink_callback *cb);
264+
int devlink_nl_port_param_get_doit(struct sk_buff *skb,
265+
struct genl_info *info);
266+
int devlink_nl_port_param_set_doit(struct sk_buff *skb,
267+
struct genl_info *info);
268+
int devlink_nl_region_new_doit(struct sk_buff *skb, struct genl_info *info);
269+
int devlink_nl_region_del_doit(struct sk_buff *skb, struct genl_info *info);
270+
int devlink_nl_region_read_dumpit(struct sk_buff *skb,
271+
struct netlink_callback *cb);
272+
int devlink_nl_health_reporter_set_doit(struct sk_buff *skb,
273+
struct genl_info *info);
274+
int devlink_nl_health_reporter_recover_doit(struct sk_buff *skb,
273275
struct genl_info *info);
274-
int devlink_nl_cmd_health_reporter_recover_doit(struct sk_buff *skb,
275-
struct genl_info *info);
276-
int devlink_nl_cmd_health_reporter_diagnose_doit(struct sk_buff *skb,
277-
struct genl_info *info);
278-
int devlink_nl_cmd_health_reporter_dump_get_dumpit(struct sk_buff *skb,
279-
struct netlink_callback *cb);
280-
int devlink_nl_cmd_health_reporter_dump_clear_doit(struct sk_buff *skb,
281-
struct genl_info *info);
282-
int devlink_nl_cmd_health_reporter_test_doit(struct sk_buff *skb,
276+
int devlink_nl_health_reporter_diagnose_doit(struct sk_buff *skb,
283277
struct genl_info *info);
284-
int devlink_nl_cmd_trap_set_doit(struct sk_buff *skb, struct genl_info *info);
285-
int devlink_nl_cmd_trap_group_set_doit(struct sk_buff *skb,
286-
struct genl_info *info);
287-
int devlink_nl_cmd_trap_policer_set_doit(struct sk_buff *skb,
278+
int devlink_nl_health_reporter_dump_get_dumpit(struct sk_buff *skb,
279+
struct netlink_callback *cb);
280+
int devlink_nl_health_reporter_dump_clear_doit(struct sk_buff *skb,
281+
struct genl_info *info);
282+
int devlink_nl_health_reporter_test_doit(struct sk_buff *skb,
288283
struct genl_info *info);
289-
int devlink_nl_cmd_rate_set_doit(struct sk_buff *skb, struct genl_info *info);
290-
int devlink_nl_cmd_rate_new_doit(struct sk_buff *skb, struct genl_info *info);
291-
int devlink_nl_cmd_rate_del_doit(struct sk_buff *skb, struct genl_info *info);
292-
int devlink_nl_cmd_linecard_set_doit(struct sk_buff *skb,
284+
int devlink_nl_trap_set_doit(struct sk_buff *skb, struct genl_info *info);
285+
int devlink_nl_trap_group_set_doit(struct sk_buff *skb, struct genl_info *info);
286+
int devlink_nl_trap_policer_set_doit(struct sk_buff *skb,
293287
struct genl_info *info);
288+
int devlink_nl_rate_set_doit(struct sk_buff *skb, struct genl_info *info);
289+
int devlink_nl_rate_new_doit(struct sk_buff *skb, struct genl_info *info);
290+
int devlink_nl_rate_del_doit(struct sk_buff *skb, struct genl_info *info);
291+
int devlink_nl_linecard_set_doit(struct sk_buff *skb, struct genl_info *info);

‎net/devlink/dpipe.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ static int devlink_dpipe_tables_fill(struct genl_info *info,
289289
return err;
290290
}
291291

292-
int devlink_nl_cmd_dpipe_table_get(struct sk_buff *skb, struct genl_info *info)
292+
int devlink_nl_dpipe_table_get_doit(struct sk_buff *skb, struct genl_info *info)
293293
{
294294
struct devlink *devlink = info->user_ptr[0];
295295
const char *table_name = NULL;
@@ -562,8 +562,8 @@ static int devlink_dpipe_entries_fill(struct genl_info *info,
562562
return genlmsg_reply(dump_ctx.skb, info);
563563
}
564564

565-
int devlink_nl_cmd_dpipe_entries_get(struct sk_buff *skb,
566-
struct genl_info *info)
565+
int devlink_nl_dpipe_entries_get_doit(struct sk_buff *skb,
566+
struct genl_info *info)
567567
{
568568
struct devlink *devlink = info->user_ptr[0];
569569
struct devlink_dpipe_table *table;
@@ -712,8 +712,8 @@ static int devlink_dpipe_headers_fill(struct genl_info *info,
712712
return err;
713713
}
714714

715-
int devlink_nl_cmd_dpipe_headers_get(struct sk_buff *skb,
716-
struct genl_info *info)
715+
int devlink_nl_dpipe_headers_get_doit(struct sk_buff *skb,
716+
struct genl_info *info)
717717
{
718718
struct devlink *devlink = info->user_ptr[0];
719719

@@ -746,8 +746,8 @@ static int devlink_dpipe_table_counters_set(struct devlink *devlink,
746746
return 0;
747747
}
748748

749-
int devlink_nl_cmd_dpipe_table_counters_set(struct sk_buff *skb,
750-
struct genl_info *info)
749+
int devlink_nl_dpipe_table_counters_set_doit(struct sk_buff *skb,
750+
struct genl_info *info)
751751
{
752752
struct devlink *devlink = info->user_ptr[0];
753753
const char *table_name;

‎net/devlink/health.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -452,8 +452,8 @@ int devlink_nl_health_reporter_get_dumpit(struct sk_buff *skb,
452452
devlink_nl_health_reporter_get_dump_one);
453453
}
454454

455-
int devlink_nl_cmd_health_reporter_set_doit(struct sk_buff *skb,
456-
struct genl_info *info)
455+
int devlink_nl_health_reporter_set_doit(struct sk_buff *skb,
456+
struct genl_info *info)
457457
{
458458
struct devlink *devlink = info->user_ptr[0];
459459
struct devlink_health_reporter *reporter;
@@ -655,8 +655,8 @@ devlink_health_reporter_state_update(struct devlink_health_reporter *reporter,
655655
}
656656
EXPORT_SYMBOL_GPL(devlink_health_reporter_state_update);
657657

658-
int devlink_nl_cmd_health_reporter_recover_doit(struct sk_buff *skb,
659-
struct genl_info *info)
658+
int devlink_nl_health_reporter_recover_doit(struct sk_buff *skb,
659+
struct genl_info *info)
660660
{
661661
struct devlink *devlink = info->user_ptr[0];
662662
struct devlink_health_reporter *reporter;
@@ -1108,8 +1108,8 @@ static int devlink_fmsg_dumpit(struct devlink_fmsg *fmsg, struct sk_buff *skb,
11081108
return err;
11091109
}
11101110

1111-
int devlink_nl_cmd_health_reporter_diagnose_doit(struct sk_buff *skb,
1112-
struct genl_info *info)
1111+
int devlink_nl_health_reporter_diagnose_doit(struct sk_buff *skb,
1112+
struct genl_info *info)
11131113
{
11141114
struct devlink *devlink = info->user_ptr[0];
11151115
struct devlink_health_reporter *reporter;
@@ -1163,8 +1163,8 @@ devlink_health_reporter_get_from_cb_lock(struct netlink_callback *cb)
11631163
return reporter;
11641164
}
11651165

1166-
int devlink_nl_cmd_health_reporter_dump_get_dumpit(struct sk_buff *skb,
1167-
struct netlink_callback *cb)
1166+
int devlink_nl_health_reporter_dump_get_dumpit(struct sk_buff *skb,
1167+
struct netlink_callback *cb)
11681168
{
11691169
struct devlink_nl_dump_state *state = devlink_dump_state(cb);
11701170
struct devlink_health_reporter *reporter;
@@ -1202,8 +1202,8 @@ int devlink_nl_cmd_health_reporter_dump_get_dumpit(struct sk_buff *skb,
12021202
return err;
12031203
}
12041204

1205-
int devlink_nl_cmd_health_reporter_dump_clear_doit(struct sk_buff *skb,
1206-
struct genl_info *info)
1205+
int devlink_nl_health_reporter_dump_clear_doit(struct sk_buff *skb,
1206+
struct genl_info *info)
12071207
{
12081208
struct devlink *devlink = info->user_ptr[0];
12091209
struct devlink_health_reporter *reporter;
@@ -1219,8 +1219,8 @@ int devlink_nl_cmd_health_reporter_dump_clear_doit(struct sk_buff *skb,
12191219
return 0;
12201220
}
12211221

1222-
int devlink_nl_cmd_health_reporter_test_doit(struct sk_buff *skb,
1223-
struct genl_info *info)
1222+
int devlink_nl_health_reporter_test_doit(struct sk_buff *skb,
1223+
struct genl_info *info)
12241224
{
12251225
struct devlink *devlink = info->user_ptr[0];
12261226
struct devlink_health_reporter *reporter;

‎net/devlink/linecard.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,8 +369,7 @@ static int devlink_linecard_type_unset(struct devlink_linecard *linecard,
369369
return err;
370370
}
371371

372-
int devlink_nl_cmd_linecard_set_doit(struct sk_buff *skb,
373-
struct genl_info *info)
372+
int devlink_nl_linecard_set_doit(struct sk_buff *skb, struct genl_info *info)
374373
{
375374
struct netlink_ext_ack *extack = info->extack;
376375
struct devlink *devlink = info->user_ptr[0];

0 commit comments

Comments
 (0)