diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-02-09 21:05:25 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-02-09 21:25:40 +0100 |
| commit | 8697a258ae24703267d2a37d91ab757c91ef027e (patch) | |
| tree | 7a1798898ac64c72e6cf77d2320f036c963a16c1 /net/devlink | |
| parent | net: enable usercopy for skb_small_head_cache (diff) | |
| parent | Merge tag 'net-6.2-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | linux-8697a258ae24703267d2a37d91ab757c91ef027e.tar.xz linux-8697a258ae24703267d2a37d91ab757c91ef027e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
net/devlink/leftover.c / net/core/devlink.c:
565b4824c39f ("devlink: change port event netdev notifier from per-net to global")
f05bd8ebeb69 ("devlink: move code to a dedicated directory")
687125b5799c ("devlink: split out core code")
https://lore.kernel.org/all/20230208094657.379f2b1a@canb.auug.org.au/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/devlink')
| -rw-r--r-- | net/devlink/core.c | 5 | ||||
| -rw-r--r-- | net/devlink/leftover.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/net/devlink/core.c b/net/devlink/core.c index aeffd1b8206d..a4f47dafb864 100644 --- a/net/devlink/core.c +++ b/net/devlink/core.c @@ -205,7 +205,7 @@ struct devlink *devlink_alloc_ns(const struct devlink_ops *ops, goto err_xa_alloc; devlink->netdevice_nb.notifier_call = devlink_port_netdevice_event; - ret = register_netdevice_notifier_net(net, &devlink->netdevice_nb); + ret = register_netdevice_notifier(&devlink->netdevice_nb); if (ret) goto err_register_netdevice_notifier; @@ -266,8 +266,7 @@ void devlink_free(struct devlink *devlink) xa_destroy(&devlink->snapshot_ids); xa_destroy(&devlink->ports); - WARN_ON_ONCE(unregister_netdevice_notifier_net(devlink_net(devlink), - &devlink->netdevice_nb)); + WARN_ON_ONCE(unregister_netdevice_notifier(&devlink->netdevice_nb)); xa_erase(&devlinks, devlink->index); diff --git a/net/devlink/leftover.c b/net/devlink/leftover.c index 9d6373603340..f05ab093d231 100644 --- a/net/devlink/leftover.c +++ b/net/devlink/leftover.c @@ -8430,6 +8430,8 @@ int devlink_port_netdevice_event(struct notifier_block *nb, break; case NETDEV_REGISTER: case NETDEV_CHANGENAME: + if (devlink_net(devlink) != dev_net(netdev)) + return NOTIFY_OK; /* Set the netdev on top of previously set type. Note this * event happens also during net namespace change so here * we take into account netdev pointer appearing in this @@ -8439,6 +8441,8 @@ int devlink_port_netdevice_event(struct notifier_block *nb, netdev); break; case NETDEV_UNREGISTER: + if (devlink_net(devlink) != dev_net(netdev)) + return NOTIFY_OK; /* Clear netdev pointer, but not the type. This event happens * also during net namespace change so we need to clear * pointer to netdev that is going to another net namespace. |