projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
[firefly-linux-kernel-4.4.55.git]
/
include
/
net
/
if_inet6.h
diff --git
a/include/net/if_inet6.h
b/include/net/if_inet6.h
index 98e5f9578f862abb894190ca729e0f4613e1a8fa..1c8b6820b69476f7247baac12183a6f5f5fe2275 100644
(file)
--- 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;
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;
/* 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;
int state;
__u32 flags;
__u8 dad_probes;
+ __u8 stable_privacy_retry;
__u16 scope;
__u16 scope;