From 165d79f831abb6267981ba191639c66a5ce9a742 Mon Sep 17 00:00:00 2001
From: Jiri Pirko <jpirko@redhat.com>
Date: Mon, 26 Apr 2010 01:46:12 +0000
Subject: [PATCH] --- yaml --- r: 194531 b: refs/heads/master c:
 be9e969d79e40c59142fa9e931aa6f085581b379 h: refs/heads/master i:   194529:
 246a1b6b145c06de8a4a085273c0e62582540740   194527:
 707fe74a628a8dad43ed281c5bdc40a0d12558c1 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/net/pppoe.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 308fbe25c9ae..2adf82110066 100644
--- 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
index cdd11ba100ea..c059c8db42e3 100644
--- 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);
 	}