mirror of
https://github.com/torvalds/linux.git
synced 2026-04-18 14:53:58 -04:00
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 <davem@davemloft.net>
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user