From 6108409cc5e5eefcd1c223cc04bbb8f2fe1b37dc Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@parallels.com>
Date: Wed, 8 Aug 2012 21:53:03 +0000
Subject: [PATCH] --- yaml --- r: 327396 b: refs/heads/master c:
 e6f8f1a739b652c56e6f959d6714d92e05621e21 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/veth.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4f2860eff3dd..edad6984434f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c7dafbfab1554705f85523fead578aa1a3d338c
+refs/heads/master: e6f8f1a739b652c56e6f959d6714d92e05621e21
diff --git a/trunk/drivers/net/veth.c b/trunk/drivers/net/veth.c
index 5852361032c4..e522ff70444c 100644
--- a/trunk/drivers/net/veth.c
+++ b/trunk/drivers/net/veth.c
@@ -348,6 +348,9 @@ static int veth_newlink(struct net *src_net, struct net_device *dev,
 	if (tbp[IFLA_ADDRESS] == NULL)
 		eth_hw_addr_random(peer);
 
+	if (ifmp && (dev->ifindex != 0))
+		peer->ifindex = ifmp->ifi_index;
+
 	err = register_netdevice(peer);
 	put_net(net);
 	net = NULL;