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/veth.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 34499b91a8bd..7a502dbed5b9 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -1827,7 +1827,9 @@ static int veth_newlink(struct net *src_net, struct net_device *dev,
 
 	netif_inherit_tso_max(peer, dev);
 
-	err = register_netdevice(peer);
+	attach_nd_lock(peer, rcu_dereference_protected(dev->nd_lock, true));
+
+	err = __register_netdevice(peer);
 	put_net(net);
 	net = NULL;
 	if (err < 0)
@@ -1858,7 +1860,7 @@ static int veth_newlink(struct net *src_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 err_register_dev;
 
@@ -1888,14 +1890,15 @@ static int veth_newlink(struct net *src_net, struct net_device *dev,
 	return 0;
 
 err_queues:
-	unregister_netdevice(dev);
+	__unregister_netdevice(dev);
 err_register_dev:
 	/* nothing to do */
 err_configure_peer:
-	unregister_netdevice(peer);
+	__unregister_netdevice(peer);
 	return err;
 
 err_register_peer:
+	detach_nd_lock(peer);
 	free_netdev(peer);
 	return err;
 }