3 files changed, 8 insertions, 1 deletions

diff --git a/include/linux/if_addr.h b/include/linux/if_addr.h
index d557e4ce9b..43f3bedaaf 100644
--- a/include/linux/if_addr.h
+++ b/include/linux/if_addr.h
@@ -39,6 +39,7 @@ enum
 #define IFA_F_TEMPORARY         IFA_F_SECONDARY
 
 #define IFA_F_NODAD             0x02
+#define IFA_F_OPTIMISTIC        0x04
 #define IFA_F_HOMEADDRESS       0x10
 #define IFA_F_DEPRECATED        0x20
 #define IFA_F_TENTATIVE         0x40
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 713eb5eaa8..e046b22a22 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -178,6 +178,9 @@ struct ipv6_devconf {
 #endif
         __s32           proxy_ndp;
         __s32           accept_source_route;
+#ifdef CONFIG_IPV6_OPTIMISTIC_DAD
+        __s32           optimistic_dad;
+#endif
         void            *sysctl;
 };
 
@@ -208,6 +211,7 @@ enum {
         DEVCONF_PROXY_NDP,
         __DEVCONF_OPTIMISTIC_DAD,
         DEVCONF_ACCEPT_SOURCE_ROUTE,
+        DEVCONF_OPTIMISTIC_DAD,
         DEVCONF_MAX
 };
 
diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index 88df8fc814..f3531d0bcd 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -73,7 +73,9 @@ extern int			ipv6_get_saddr(struct dst_entry *dst,
 extern int                      ipv6_dev_get_saddr(struct net_device *dev, 
                                                struct in6_addr *daddr,
                                                struct in6_addr *saddr);
-extern int                      ipv6_get_lladdr(struct net_device *dev, struct in6_addr *);
+extern int                      ipv6_get_lladdr(struct net_device *dev,
+                                                struct in6_addr *addr,
+                                                unsigned char banned_flags);
 extern int                      ipv6_rcv_saddr_equal(const struct sock *sk, 
                                                       const struct sock *sk2);
 extern void                     addrconf_join_solict(struct net_device *dev,