---

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

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6f8f1a739b652c56e6f959d6714d92e05621e21
+refs/heads/master: aa79e66eee5d525e2fcbd2a5fcb87ae3dd4aa9e9
diff --git a/trunk/include/net/net_namespace.h b/trunk/include/net/net_namespace.h
@@ -66,6 +66,7 @@ struct net {
 	struct hlist_head 	*dev_name_head;
 	struct hlist_head	*dev_index_head;
 	unsigned int		dev_base_seq;	/* protected by rtnl_mutex */
+	int			ifindex;
 
 	/* core fib_rules */
 	struct list_head	rules_ops;

diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -5221,12 +5221,12 @@ int dev_ioctl(struct net *net, unsigned int cmd, void __user *arg)
  */
 static int dev_new_index(struct net *net)
 {
-	static int ifindex;
+	int ifindex = net->ifindex;
 	for (;;) {
 		if (++ifindex <= 0)
 			ifindex = 1;
 		if (!__dev_get_by_index(net, ifindex))
-			return ifindex;
+			return net->ifindex = ifindex;
 	}
 }