diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2011-07-26 13:50:49 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-01 18:05:00 -0700 |
| commit | 76f793e3a47139d340185cbc1a314740c09b13d3 (patch) | |
| tree | 9abd3f1753cb10d328cc87db365910ef2181ea69 /include/net | |
| parent | 79f88ee9836d482891ba41b1a553e2baacf31b02 (diff) | |
| download | linux-3.10-76f793e3a47139d340185cbc1a314740c09b13d3.tar.gz linux-3.10-76f793e3a47139d340185cbc1a314740c09b13d3.tar.bz2 linux-3.10-76f793e3a47139d340185cbc1a314740c09b13d3.zip | |
ipv6: updates to privacy addresses per RFC 4941.
Update the code to handle some of the differences between
RFC 3041 and RFC 4941, which obsoletes it. Also a couple
of janitorial fixes.
- Allow router advertisements to increase the lifetime of
temporary addresses. This was not allowed by RFC 3041,
but is specified by RFC 4941. It is useful when RA
lifetimes are lower than TEMP_{VALID,PREFERRED}_LIFETIME:
in this case, the previous code would delete or deprecate
addresses prematurely.
- Change the default of MAX_RETRY to 3 per RFC 4941.
- Add a comment to clarify that the preferred and valid
lifetimes in inet6_ifaddr are relative to the timestamp.
- Shorten lines to 80 characters in a couple of places.
Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/addrconf.h | 2 | ||||
| -rw-r--r-- | include/net/if_inet6.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/net/addrconf.h b/include/net/addrconf.h index 582e4ae7075..cbc6bb0a683 100644 --- a/include/net/addrconf.h +++ b/include/net/addrconf.h @@ -8,7 +8,7 @@ #define TEMP_VALID_LIFETIME (7*86400) #define TEMP_PREFERRED_LIFETIME (86400) -#define REGEN_MAX_RETRY (5) +#define REGEN_MAX_RETRY (3) #define MAX_DESYNC_FACTOR (600) #define ADDR_CHECK_FREQUENCY (120*HZ) diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h index 11cf373970a..51a7031b4aa 100644 --- a/include/net/if_inet6.h +++ b/include/net/if_inet6.h @@ -41,6 +41,7 @@ struct inet6_ifaddr { struct in6_addr addr; __u32 prefix_len; + /* In seconds, relative to tstamp. Expiry is at tstamp + HZ * lft. */ __u32 valid_lft; __u32 prefered_lft; atomic_t refcnt; |