From 77987666593d1719895d7ee662b7370a64bbde36 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sun, 1 Nov 2009 19:51:22 +0000
Subject: [PATCH] --- yaml --- r: 171111 b: refs/heads/master c:
 1178f66eaea968d093cafd37c226ebeaa70d56cf h: refs/heads/master i:   171109:
 877796e60ee12284f5e94aa129f066408a15764d   171107:
 4225ea3098b85ec48388768007d90c6199e35562   171103:
 765f4650f8ce5015232b91b8ae8adf7bb227c3af v: v3

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

diff --git a/[refs] b/[refs]
index c4e7984b8e9a..616bc374fe5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05e8689c9a3a208bf75b60662778d81e23eac460
+refs/heads/master: 1178f66eaea968d093cafd37c226ebeaa70d56cf
diff --git a/trunk/drivers/net/pppoe.c b/trunk/drivers/net/pppoe.c
index 2559991eea6a..60c8d233209f 100644
--- a/trunk/drivers/net/pppoe.c
+++ b/trunk/drivers/net/pppoe.c
@@ -250,20 +250,19 @@ static inline struct pppox_sock *get_item_by_addr(struct net *net,
 {
 	struct net_device *dev;
 	struct pppoe_net *pn;
-	struct pppox_sock *pppox_sock;
+	struct pppox_sock *pppox_sock = NULL;
 
 	int ifindex;
 
-	dev = dev_get_by_name(net, sp->sa_addr.pppoe.dev);
-	if (!dev)
-		return NULL;
-
-	ifindex = dev->ifindex;
-	pn = net_generic(net, pppoe_net_id);
-	pppox_sock = get_item(pn, sp->sa_addr.pppoe.sid,
+	rcu_read_lock();
+	dev = dev_get_by_name_rcu(net, sp->sa_addr.pppoe.dev);
+	if (dev) {
+		ifindex = dev->ifindex;
+		pn = net_generic(net, pppoe_net_id);
+		pppox_sock = get_item(pn, sp->sa_addr.pppoe.sid,
 				sp->sa_addr.pppoe.remote, ifindex);
-	dev_put(dev);
-
+	}
+	rcu_read_unlock();
 	return pppox_sock;
 }