X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=include%2Fnet%2Fif_inet6.h;h=b4956a5fcc3f117e9e4199a5ad7af94894fea859;hb=c15b1ccadb323ea50023e8f1cca2954129a62b51;hp=9650a3ffd2d2328f11859adc4a3169ae41b25442;hpb=12f2bbd609006f983c1c99d240cf61e6e829a14c;p=~andy%2Flinux

diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h
index 9650a3ffd2d..b4956a5fcc3 100644
--- a/include/net/if_inet6.h
+++ b/include/net/if_inet6.h
@@ -31,8 +31,10 @@
 #define IF_PREFIX_AUTOCONF	0x02
 
 enum {
+	INET6_IFADDR_STATE_PREDAD,
 	INET6_IFADDR_STATE_DAD,
 	INET6_IFADDR_STATE_POSTDAD,
+	INET6_IFADDR_STATE_ERRDAD,
 	INET6_IFADDR_STATE_UP,
 	INET6_IFADDR_STATE_DEAD,
 };
@@ -58,7 +60,7 @@ struct inet6_ifaddr {
 	unsigned long		cstamp;	/* created timestamp */
 	unsigned long		tstamp; /* updated timestamp */
 
-	struct timer_list	dad_timer;
+	struct delayed_work	dad_work;
 
 	struct inet6_dev	*idev;
 	struct rt6_info		*rt;