ipv6: Replace inet6_ifaddr->dead with state

This patch replaces the boolean dead flag on inet6_ifaddr with
a state enum.  This allows us to roll back changes when deleting
an address according to whether DAD has completed or not.

This patch only adds the state field and does not change the logic.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 10 insertions, 2 deletions

diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h
index 13f9fc086d54..f95ff8d9aa47 100644
--- a/include/net/if_inet6.h
+++ b/include/net/if_inet6.h
@@ -32,6 +32,13 @@
 
 #ifdef __KERNEL__
 
+enum {
+        INET6_IFADDR_STATE_DAD,
+        INET6_IFADDR_STATE_POSTDAD,
+        INET6_IFADDR_STATE_UP,
+        INET6_IFADDR_STATE_DEAD,
+};
+
 struct inet6_ifaddr {
         struct in6_addr         addr;
         __u32                   prefix_len;
@@ -40,6 +47,9 @@ struct inet6_ifaddr {
         __u32                   prefered_lft;
         atomic_t                refcnt;
         spinlock_t              lock;
+        spinlock_t              state_lock;
+
+        int                     state;
 
         __u8                    probes;
         __u8                    flags;
@@ -62,8 +72,6 @@ struct inet6_ifaddr {
         struct inet6_ifaddr     *ifpub;
         int                     regen_count;
 #endif
-
-        int                     dead;
         struct rcu_head         rcu;
 };