Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
+7
-4
+7
-4
net/ipv6/addrconf.c
+7
-4
net/ipv6/addrconf.c
···
2467
2467
return;
2468
2468
}
2469
2469
2470
-
if (idev->if_flags & IF_READY)
2470
+
if (idev->if_flags & IF_READY) {
2471
2471
addrconf_dad_kick(ifp);
2472
-
else {
2472
+
spin_unlock_bh(&ifp->lock);
2473
+
} else {
2474
+
spin_unlock_bh(&ifp->lock);
2473
2475
/*
2474
2476
* If the defice is not ready:
2475
2477
* - keep it tentative if it is a permanent address.
···
2480
2478
in6_ifa_hold(ifp);
2481
2479
addrconf_dad_stop(ifp);
2482
2480
}
2483
-
2484
-
spin_unlock_bh(&ifp->lock);
2485
2481
out:
2486
2482
read_unlock_bh(&idev->lock);
2487
2483
}
···
2782
2782
in6_ifa_hold(ifpub);
2783
2783
spin_unlock(&ifp->lock);
2784
2784
read_unlock(&addrconf_hash_lock);
2785
+
spin_lock(&ifpub->lock);
2786
+
ifpub->regen_count = 0;
2787
+
spin_unlock(&ifpub->lock);
2785
2788
ipv6_create_tempaddr(ifpub, ifp);
2786
2789
in6_ifa_put(ifpub);
2787
2790
in6_ifa_put(ifp);