Merge branch 'master' into gfs2

[linux-2.6-omap-h63xx.git] / net / ipv6 / addrconf.c

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 8ea1e36bf8ebbe7b5b9f161272a66cf28c35c3bb..0c5042e7380d391769f8e484132157735cb35e6e 100644 (file)
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1909,11 +1909,11 @@ static int inet6_addr_add(int ifindex, struct in6_addr *pfx, int plen,
        ifp = ipv6_add_addr(idev, pfx, plen, scope, ifa_flags);
 
        if (!IS_ERR(ifp)) {
-               spin_lock(&ifp->lock);
+               spin_lock_bh(&ifp->lock);
                ifp->valid_lft = valid_lft;
                ifp->prefered_lft = prefered_lft;
                ifp->tstamp = jiffies;
-               spin_unlock(&ifp->lock);
+               spin_unlock_bh(&ifp->lock);
 
                addrconf_dad_start(ifp, 0);
                in6_ifa_put(ifp);