ipv6: Avoid unnecessary temporary addresses being generated
authorHeiner Kallweit <heiner.kallweit@web.de>
Wed, 12 Mar 2014 21:13:19 +0000 (22:13 +0100)
committerJiri Slaby <jslaby@suse.cz>
Fri, 18 Apr 2014 09:07:05 +0000 (11:07 +0200)
commit69a5b094705fa4e33ec2403c9cd9609b7dc72444
treed3e7bba5af05a0e2a6e89584994b5af5e0bed75e
parenta488bc7135f7bb3c4a716105bda1d119748f87b2
ipv6: Avoid unnecessary temporary addresses being generated

[ Upstream commit ecab67015ef6e3f3635551dcc9971cf363cc1cd5 ]

tmp_prefered_lft is an offset to ifp->tstamp, not now. Therefore
age needs to be added to the condition.

Age calculation in ipv6_create_tempaddr is different from the one
in addrconf_verify and doesn't consider ADDRCONF_TIMER_FUZZ_MINUS.
This can cause age in ipv6_create_tempaddr to be less than the one
in addrconf_verify and therefore unnecessary temporary address to
be generated.
Use age calculation as in addrconf_modify to avoid this.

Signed-off-by: Heiner Kallweit <heiner.kallweit@web.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
net/ipv6/addrconf.c