diff options
| author | David S. Miller <davem@davemloft.net> | 2023-01-30 08:37:46 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-01-30 08:37:46 +0000 |
| commit | 90e8ca0abb05ada6c1e2710eaa21688dafca26f2 (patch) | |
| tree | b28cedef2ff2c2836ebd79b7b2a67f92f854bb6e /net/devlink/core.c | |
| parent | 166a1a5a12b056a389b8dc529033cafaa290ca7c (diff) | |
| parent | fb8421a94c5613fee86e192bab0892ecb1d56e4c (diff) | |
Merge branch 'devlink-next'
Jakub Kicinski says:
====================
devlink: fix reload notifications and remove features
First two patches adjust notifications during devlink reload.
The last patch removes no longer needed devlink features.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Reviewed-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/devlink/core.c')
| -rw-r--r-- | net/devlink/core.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/net/devlink/core.c b/net/devlink/core.c index 6c0e2fc57e45..aeffd1b8206d 100644 --- a/net/devlink/core.c +++ b/net/devlink/core.c @@ -126,23 +126,6 @@ next: } /** - * devlink_set_features - Set devlink supported features - * - * @devlink: devlink - * @features: devlink support features - * - * This interface allows us to set reload ops separatelly from - * the devlink_alloc. - */ -void devlink_set_features(struct devlink *devlink, u64 features) -{ - WARN_ON(features & DEVLINK_F_RELOAD && - !devlink_reload_supported(devlink->ops)); - devlink->features = features; -} -EXPORT_SYMBOL_GPL(devlink_set_features); - -/** * devl_register - Register devlink instance * @devlink: devlink */ @@ -303,7 +286,6 @@ static void __net_exit devlink_pernet_pre_exit(struct net *net) * all devlink instances from this namespace into init_net. */ devlinks_xa_for_each_registered_get(net, index, devlink) { - WARN_ON(!(devlink->features & DEVLINK_F_RELOAD)); devl_lock(devlink); err = 0; if (devl_is_registered(devlink)) @@ -313,7 +295,6 @@ static void __net_exit devlink_pernet_pre_exit(struct net *net) &actions_performed, NULL); devl_unlock(devlink); devlink_put(devlink); - if (err && err != -EOPNOTSUPP) pr_warn("Failed to reload devlink instance into init_net\n"); } |