From 8872c6f9d576462e942370a6fb2a5c18b542b495 Mon Sep 17 00:00:00 2001
From: stephen hemminger <shemminger@vyatta.com>
Date: Tue, 10 Nov 2009 07:54:56 +0000
Subject: [PATCH] --- yaml --- r: 171497 b: refs/heads/master c:
 ff879eb611dba859c4349048a32789e8c82afa91 h: refs/heads/master i:   171495:
 fb3aef017e1c06c9258a72ef4eee37d838bb9a0f v: v3

---
 [refs]              | 2 +-
 trunk/net/can/bcm.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 50bc646adf09..e93636580061 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61fbab77a843d2e772322ac130715cc9a98bf718
+refs/heads/master: ff879eb611dba859c4349048a32789e8c82afa91
diff --git a/trunk/net/can/bcm.c b/trunk/net/can/bcm.c
index c302c2ec959c..e32af52238a2 100644
--- a/trunk/net/can/bcm.c
+++ b/trunk/net/can/bcm.c
@@ -139,13 +139,13 @@ static char *bcm_proc_getifname(char *result, int ifindex)
 	if (!ifindex)
 		return "any";
 
-	read_lock(&dev_base_lock);
-	dev = __dev_get_by_index(&init_net, ifindex);
+	rcu_read_lock();
+	dev = dev_get_by_index_rcu(&init_net, ifindex);
 	if (dev)
 		strcpy(result, dev->name);
 	else
 		strcpy(result, "???");
-	read_unlock(&dev_base_lock);
+	rcu_read_unlock();
 
 	return result;
 }