Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6

[pandora-kernel.git] / net / ieee802154 / af_ieee802154.c

diff --git a/net/ieee802154/af_ieee802154.c b/net/ieee802154/af_ieee802154.c
index 93c91b6..6df6ecf 100644 (file)
--- a/net/ieee802154/af_ieee802154.c
+++ b/net/ieee802154/af_ieee802154.c
@@ -52,11 +52,11 @@ struct net_device *ieee802154_get_dev(struct net *net,
 
        switch (addr->addr_type) {
        case IEEE802154_ADDR_LONG:
-               rtnl_lock();
-               dev = dev_getbyhwaddr(net, ARPHRD_IEEE802154, addr->hwaddr);
+               rcu_read_lock();
+               dev = dev_getbyhwaddr_rcu(net, ARPHRD_IEEE802154, addr->hwaddr);
                if (dev)
                        dev_hold(dev);
-               rtnl_unlock();
+               rcu_read_unlock();
                break;
        case IEEE802154_ADDR_SHORT:
                if (addr->pan_id == 0xffff ||