Commit 88949cf4 authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

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: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e21e8467

net/ipv6/addrconf.c

+4 −9
Original line number Diff line number Diff line
@@ -3124,9 +3124,6 @@ static void addrconf_verify(unsigned long foo) 
		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 @@ static void addrconf_verify(unsigned long foo) 
			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 @@ static void addrconf_verify(unsigned long foo) 
#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))