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@ya.ru>
---
 drivers/net/can/vxcan.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/net/can/vxcan.c b/drivers/net/can/vxcan.c
index 9e1b7d41005f..6c44472af609 100644
--- a/drivers/net/can/vxcan.c
+++ b/drivers/net/can/vxcan.c
@@ -221,10 +221,12 @@ static int vxcan_newlink(struct net *net, struct net_device *dev,
 	if (ifmp && dev->ifindex)
 		peer->ifindex = ifmp->ifi_index;
 
-	err = register_netdevice(peer);
+	attach_nd_lock(peer, rcu_dereference_protected(dev->nd_lock, true));
+	err = __register_netdevice(peer);
 	put_net(peer_net);
 	peer_net = NULL;
 	if (err < 0) {
+		detach_nd_lock(peer);
 		free_netdev(peer);
 		return err;
 	}
@@ -241,7 +243,7 @@ static int vxcan_newlink(struct net *net, struct net_device *dev,
 	else
 		snprintf(dev->name, IFNAMSIZ, DRV_NAME "%%d");
 
-	err = register_netdevice(dev);
+	err = __register_netdevice(dev);
 	if (err < 0)
 		goto unregister_network_device;
 
@@ -257,7 +259,7 @@ static int vxcan_newlink(struct net *net, struct net_device *dev,
 	return 0;
 
 unregister_network_device:
-	unregister_netdevice(peer);
+	__unregister_netdevice(peer);
 	return err;
 }