---

yaml --- r: 327396 b: refs/heads/master c: e6f8f1a h: refs/heads/master v: v3
git-mirror · Aug 9, 2012 · 6108409 · 6108409
1 parent 99aa985
commit 6108409
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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;