diff options
| author |   Heiner Kallweit <heiner.kallweit@web.de> | 2014-03-12 22:13:19 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-03-13 15:49:14 -0400 |
| commit | ecab67015ef6e3f3635551dcc9971cf363cc1cd5 (patch) | |
| tree | c91b67d0b541d7a1f9c436b43082b4c70913f189 /net/ipv6/addrconf.c | |
| parent | eth: fec: Fix lost promiscuous mode after reconnecting cable (diff) | |
| download | linux-dev-ecab67015ef6e3f3635551dcc9971cf363cc1cd5.tar.xz linux-dev-ecab67015ef6e3f3635551dcc9971cf363cc1cd5.zip | |
ipv6: Avoid unnecessary temporary addresses being generated
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>
Diffstat (limited to 'net/ipv6/addrconf.c')
| -rw-r--r-- | net/ipv6/addrconf.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index fdbfeca36d63..344e972426df 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -1103,8 +1103,11 @@ retry: * Lifetime is greater than REGEN_ADVANCE time units. In particular, * an implementation must not create a temporary address with a zero * Preferred Lifetime. + * Use age calculation as in addrconf_verify to avoid unnecessary + * temporary addresses being generated. */ - if (tmp_prefered_lft <= regen_advance) { + age = (now - tmp_tstamp + ADDRCONF_TIMER_FUZZ_MINUS) / HZ; + if (tmp_prefered_lft <= regen_advance + age) { in6_ifa_put(ifp); in6_dev_put(idev); ret = -1; |