Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / net / llc / af_llc.c

diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index e35dbe55f5201c7a8b4b61ffe382766e4abadcb8..dfd3a648a55107bda2ff14adb6f9e91c06449240 100644 (file)
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -316,7 +316,6 @@ static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen)
        if (unlikely(addr->sllc_family != AF_LLC))
                goto out;
        rc = -ENODEV;
-       rtnl_lock();
        rcu_read_lock();
        if (sk->sk_bound_dev_if) {
                llc->dev = dev_get_by_index_rcu(&init_net, sk->sk_bound_dev_if);
@@ -334,10 +333,11 @@ static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen)
                        }
                }
        } else
-               llc->dev = dev_getbyhwaddr(&init_net, addr->sllc_arphrd,
+               llc->dev = dev_getbyhwaddr_rcu(&init_net, addr->sllc_arphrd,
                                           addr->sllc_mac);
+       if (llc->dev)
+               dev_hold(llc->dev);
        rcu_read_unlock();
-       rtnl_unlock();
        if (!llc->dev)
                goto out;
        if (!addr->sllc_sap) {