diff options
| author | David S. Miller <davem@davemloft.net> | 2015-03-24 05:12:15 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-24 05:12:15 +0300 |
| commit | ce046c568cbfb4734583131086f88cfe993c01d0 (patch) | |
| tree | 8bba1bae6c6c9edf8c630dd317c748a7bfc80c69 /include/net/if_inet6.h | |
| parent | 7f163d07ecd6fbba2ed3a2fcd0ca830846cc170e (diff) | |
| parent | 9f0761c154eaf2bf796f7e0e3431631de8d362ae (diff) | |
| download | linux-ce046c568cbfb4734583131086f88cfe993c01d0.tar.xz | |
Merge branch 'ipv6_stable_privacy_address'
Hannes Frederic Sowa says:
====================
ipv6: RFC7217 stable privacy addresses implementation
this is an implementation of basic support for RFC7217 stable privacy
addresses. Please review and consider for net-next.
v2:
* Correct references to RFC 7212 -> RFC 7217 in documentation patch (thanks, Eric!)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/if_inet6.h')
| -rw-r--r-- | include/net/if_inet6.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h index 98e5f9578f86..1c8b6820b694 100644 --- a/include/net/if_inet6.h +++ b/include/net/if_inet6.h @@ -41,18 +41,18 @@ enum { 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; spinlock_t lock; - spinlock_t state_lock; int state; __u32 flags; __u8 dad_probes; + __u8 stable_privacy_retry; __u16 scope; |