nl80211: only allow adding stations to running vlan interfaces

[safe/jmp/linux-2.6] / net / can / bcm.c

diff --git a/net/can/bcm.c b/net/can/bcm.c
index c302c2e..e32af52 100644 (file)
--- a/net/can/bcm.c
+++ b/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;
 }