diff options
| author | David S. Miller <[email protected]> | 2023-02-17 11:06:39 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2023-02-17 11:06:39 +0000 |
| commit | 675f176b4dcc2b75adbcea7ba0e9a649527f53bd (patch) | |
| tree | dc5eea870c19b405bb6558964e5367bb6c9205c5 /net/devlink/dev.c | |
| parent | Merge branch 'mlx5-next' of https://git.kernel.org/pub/scm/linux/kernel/git/m... (diff) | |
| parent | Merge tag 'drm-fixes-2023-02-17' of git://anongit.freedesktop.org/drm/drm (diff) | |
| download | kernel-675f176b4dcc2b75adbcea7ba0e9a649527f53bd.tar.gz kernel-675f176b4dcc2b75adbcea7ba0e9a649527f53bd.zip | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net
Some of the devlink bits were tricky, but I think I got it right.
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/devlink/dev.c')
| -rw-r--r-- | net/devlink/dev.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/devlink/dev.c b/net/devlink/dev.c index b40153fa2680..bf1d6f1bcfc7 100644 --- a/net/devlink/dev.c +++ b/net/devlink/dev.c @@ -343,8 +343,6 @@ static void devlink_reload_netns_change(struct devlink *devlink, * reload process so the notifications are generated separatelly. */ devlink_notify_unregister(devlink); - move_netdevice_notifier_net(curr_net, dest_net, - &devlink->netdevice_nb); write_pnet(&devlink->_net, dest_net); devlink_notify_register(devlink); } |