diff options
| author | Mark Brown <broonie@kernel.org> | 2023-07-24 01:34:06 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-07-24 01:34:06 +0300 |
| commit | 9c214af0bd0f43df214470a35bc38dd5602b666f (patch) | |
| tree | e95ac46b8fdca90a122b73eac96158985d85ef70 /net/ipv6/addrconf.c | |
| parent | e02a4ccbeced64aa10f4e99683c721ec43e993c1 (diff) | |
| parent | 6eaae198076080886b9e7d57f4ae06fa782f90ef (diff) | |
| download | linux-9c214af0bd0f43df214470a35bc38dd5602b666f.tar.xz | |
regmap: Merge up fixes from mainline
There's several things here that will really help my CI.
Diffstat (limited to 'net/ipv6/addrconf.c')
| -rw-r--r-- | net/ipv6/addrconf.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 5479da08ef40..e5213e598a04 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -318,9 +318,8 @@ static void addrconf_del_dad_work(struct inet6_ifaddr *ifp) static void addrconf_mod_rs_timer(struct inet6_dev *idev, unsigned long when) { - if (!timer_pending(&idev->rs_timer)) + if (!mod_timer(&idev->rs_timer, jiffies + when)) in6_dev_hold(idev); - mod_timer(&idev->rs_timer, jiffies + when); } static void addrconf_mod_dad_work(struct inet6_ifaddr *ifp, |