---

yaml --- r: 351972 b: refs/heads/master c: 556e625 h: refs/heads/master v: v3
git-mirror · Jan 28, 2013 · 2dc7d3d · 2dc7d3d
1 parent 04e5ecc
commit 2dc7d3d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: faeed828f9607923e9dc22182e819908e95c8852
+refs/heads/master: 556e6256c813063b95a9f4e55109f77c1a7d3fdd
diff --git a/trunk/net/core/netpoll.c b/trunk/net/core/netpoll.c
@@ -1049,8 +1049,10 @@ int netpoll_setup(struct netpoll *np)
 	int err;
 
 	rtnl_lock();
-	if (np->dev_name)
-		ndev = __dev_get_by_name(&init_net, np->dev_name);
+	if (np->dev_name) {
+		struct net *net = current->nsproxy->net_ns;
+		ndev = __dev_get_by_name(net, np->dev_name);
+	}
 	if (!ndev) {
 		np_err(np, "%s doesn't exist, aborting\n", np->dev_name);
 		err = -ENODEV;