---

yaml --- r: 194531 b: refs/heads/master c: be9e969 h: refs/heads/master i: 194529: 246a1b6 194527: 707fe74 v: v3
git-mirror · Apr 26, 2010 · 165d79f · 165d79f
1 parent dca681d
commit 165d79f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0db3f0f49a99db33a411af1c4352839c0296eff3
+refs/heads/master: be9e969d79e40c59142fa9e931aa6f085581b379
diff --git a/trunk/drivers/net/pppoe.c b/trunk/drivers/net/pppoe.c
@@ -258,7 +258,7 @@ static inline struct pppox_sock *get_item_by_addr(struct net *net,
 	dev = dev_get_by_name_rcu(net, sp->sa_addr.pppoe.dev);
 	if (dev) {
 		ifindex = dev->ifindex;
-		pn = net_generic(net, pppoe_net_id);
+		pn = pppoe_pernet(net);
 		pppox_sock = get_item(pn, sp->sa_addr.pppoe.sid,
 				sp->sa_addr.pppoe.remote, ifindex);
 	}