summaryrefslogtreecommitdiff
path: root/include/net/if_inet6.h
diff options
context:
space:
mode:
authorHannes Frederic Sowa <hannes@stressinduktion.org>2015-03-24 01:36:03 +0300
committerDavid S. Miller <davem@davemloft.net>2015-03-24 05:12:09 +0300
commit8e8e676d0b3c7f074c719c7c05b20296b9b0b0b1 (patch)
treee847c044663490f60460ec84b3d1c37d5f5638b0 /include/net/if_inet6.h
parent64236f3f3d742469e4027b83a9515e84e9ab21b4 (diff)
downloadlinux-8e8e676d0b3c7f074c719c7c05b20296b9b0b0b1.tar.xz
ipv6: collapse state_lock and lock
Cc: Erik Kline <ek@google.com> Cc: Fernando Gont <fgont@si6networks.com> Cc: Lorenzo Colitti <lorenzo@google.com> Cc: YOSHIFUJI Hideaki/吉藤英明 <hideaki.yoshifuji@miraclelinux.com> Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/if_inet6.h')
-rw-r--r--include/net/if_inet6.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h
index 98e5f9578f86..d89397a22903 100644
--- a/include/net/if_inet6.h
+++ b/include/net/if_inet6.h
@@ -41,13 +41,12 @@ 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;