diff options
| author | stephen hemminger <shemminger@vyatta.com> | 2010-03-17 20:31:17 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-20 16:09:11 -0700 |
| commit | 88949cf484bfc399e1d662b5dda6892aaca21aae (patch) | |
| tree | 564c3c208e9e01ac95d6b7b8a759a90d57cc6d03 /net/ipv6 | |
| parent | e21e8467d3188a36f7f0af0d4b9aae74e23fda0e (diff) | |
| download | linux-3.10-88949cf484bfc399e1d662b5dda6892aaca21aae.tar.gz linux-3.10-88949cf484bfc399e1d662b5dda6892aaca21aae.tar.bz2 linux-3.10-88949cf484bfc399e1d662b5dda6892aaca21aae.zip | |
IPv6: addrconf cleanup addrconf_verify
The variable regen_advance is only used in the privacy case.
Move it to simplify code and eliminate ifdef's
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/addrconf.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 279580eab30..36ebb4ad8a0 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -3124,9 +3124,6 @@ restart: hlist_for_each_entry_rcu(ifp, node, &inet6_addr_lst[i], addr_lst) { unsigned long age; -#ifdef CONFIG_IPV6_PRIVACY - unsigned long regen_advance; -#endif if (ifp->flags & IFA_F_PERMANENT) continue; @@ -3134,12 +3131,6 @@ restart: spin_lock(&ifp->lock); age = (now - ifp->tstamp) / HZ; -#ifdef CONFIG_IPV6_PRIVACY - regen_advance = ifp->idev->cnf.regen_max_retry * - ifp->idev->cnf.dad_transmits * - ifp->idev->nd_parms->retrans_time / HZ; -#endif - if (ifp->valid_lft != INFINITY_LIFE_TIME && age >= ifp->valid_lft) { spin_unlock(&ifp->lock); @@ -3173,6 +3164,10 @@ restart: #ifdef CONFIG_IPV6_PRIVACY } else if ((ifp->flags&IFA_F_TEMPORARY) && !(ifp->flags&IFA_F_TENTATIVE)) { + unsigned long regen_advance = ifp->idev->cnf.regen_max_retry * + ifp->idev->cnf.dad_transmits * + ifp->idev->nd_parms->retrans_time / HZ; + if (age >= ifp->prefered_lft - regen_advance) { struct inet6_ifaddr *ifpub = ifp->ifpub; if (time_before(ifp->tstamp + ifp->prefered_lft * HZ, next)) |