[PATCH NET-PREV 17/51] netkit: Use __register_netdevice in .newlink

[Kirill Tkhai]

The objective is to conform .newlink with its callers,
which already assign nd_lock (and matches master nd_lock
if there is one).

Also, use __unregister_netdevice() since we know
there is held lock in that path.

Signed-off-by: Kirill Tkhai <tkhai@xxxxx>
---
 drivers/net/netkit.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/net/netkit.c b/drivers/net/netkit.c
index 16789cd446e9..da8d806b8249 100644
--- a/drivers/net/netkit.c
+++ b/drivers/net/netkit.c
@@ -408,7 +408,8 @@ static int netkit_new_link(struct net *src_net, struct net_device *dev,
 	nk->mode = mode;
 	bpf_mprog_bundle_init(&nk->bundle);
 
-	err = register_netdevice(peer);
+	attach_nd_lock(peer, rcu_dereference_protected(dev->nd_lock, true));
+	err = __register_netdevice(peer);
 	put_net(net);
 	if (err < 0)
 		goto err_register_peer;
@@ -433,7 +434,7 @@ static int netkit_new_link(struct net *src_net, struct net_device *dev,
 	nk->mode = mode;
 	bpf_mprog_bundle_init(&nk->bundle);
 
-	err = register_netdevice(dev);
+	err = __register_netdevice(dev);
 	if (err < 0)
 		goto err_configure_peer;
 	netif_carrier_off(dev);
@@ -444,9 +445,10 @@ static int netkit_new_link(struct net *src_net, struct net_device *dev,
 	rcu_assign_pointer(netkit_priv(peer)->peer, dev);
 	return 0;
 err_configure_peer:
-	unregister_netdevice(peer);
+	__unregister_netdevice(peer);
 	return err;
 err_register_peer:
+	detach_nd_lock(peer);
 	free_netdev(peer);
 	return err;
 }