Skip to content

Commit 69d56e0

Browse files
Moshe Shemeshkuba-moo
authored andcommitted
devlink: Change devlink_reload_supported() param type
Change devlink_reload_supported() function to get devlink_ops pointer param instead of devlink pointer param. This change will be used in the next patch to check if devlink reload is supported before devlink instance is allocated. Signed-off-by: Moshe Shemesh <[email protected]> Reviewed-by: Jakub Kicinski <[email protected]> Reviewed-by: Jiri Pirko <[email protected]> Reviewed-by: Jacob Keller <[email protected]> Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 846e463 commit 69d56e0

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

net/core/devlink.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2963,9 +2963,9 @@ static void devlink_reload_netns_change(struct devlink *devlink,
29632963
DEVLINK_CMD_PARAM_NEW);
29642964
}
29652965

2966-
static bool devlink_reload_supported(const struct devlink *devlink)
2966+
static bool devlink_reload_supported(const struct devlink_ops *ops)
29672967
{
2968-
return devlink->ops->reload_down && devlink->ops->reload_up;
2968+
return ops->reload_down && ops->reload_up;
29692969
}
29702970

29712971
static void devlink_reload_failed_set(struct devlink *devlink,
@@ -3009,7 +3009,7 @@ static int devlink_nl_cmd_reload(struct sk_buff *skb, struct genl_info *info)
30093009
struct net *dest_net = NULL;
30103010
int err;
30113011

3012-
if (!devlink_reload_supported(devlink))
3012+
if (!devlink_reload_supported(devlink->ops))
30133013
return -EOPNOTSUPP;
30143014

30153015
err = devlink_resources_validate(devlink, NULL, info);
@@ -7679,7 +7679,7 @@ EXPORT_SYMBOL_GPL(devlink_register);
76797679
void devlink_unregister(struct devlink *devlink)
76807680
{
76817681
mutex_lock(&devlink_mutex);
7682-
WARN_ON(devlink_reload_supported(devlink) &&
7682+
WARN_ON(devlink_reload_supported(devlink->ops) &&
76837683
devlink->reload_enabled);
76847684
devlink_notify(devlink, DEVLINK_CMD_DEL);
76857685
list_del(&devlink->list);
@@ -8720,7 +8720,7 @@ __devlink_param_driverinit_value_set(struct devlink *devlink,
87208720
int devlink_param_driverinit_value_get(struct devlink *devlink, u32 param_id,
87218721
union devlink_param_value *init_val)
87228722
{
8723-
if (!devlink_reload_supported(devlink))
8723+
if (!devlink_reload_supported(devlink->ops))
87248724
return -EOPNOTSUPP;
87258725

87268726
return __devlink_param_driverinit_value_get(&devlink->param_list,
@@ -8767,7 +8767,7 @@ int devlink_port_param_driverinit_value_get(struct devlink_port *devlink_port,
87678767
{
87688768
struct devlink *devlink = devlink_port->devlink;
87698769

8770-
if (!devlink_reload_supported(devlink))
8770+
if (!devlink_reload_supported(devlink->ops))
87718771
return -EOPNOTSUPP;
87728772

87738773
return __devlink_param_driverinit_value_get(&devlink_port->param_list,
@@ -9968,7 +9968,7 @@ static void __net_exit devlink_pernet_pre_exit(struct net *net)
99689968
mutex_lock(&devlink_mutex);
99699969
list_for_each_entry(devlink, &devlink_list, list) {
99709970
if (net_eq(devlink_net(devlink), net)) {
9971-
if (WARN_ON(!devlink_reload_supported(devlink)))
9971+
if (WARN_ON(!devlink_reload_supported(devlink->ops)))
99729972
continue;
99739973
err = devlink_reload(devlink, &init_net, NULL);
99749974
if (err && err != -EOPNOTSUPP)

0 commit comments

Comments
 (0)