diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/if_addr.h | 1 | ||||
-rw-r--r-- | include/linux/ipv6.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/if_addr.h b/include/linux/if_addr.h index d557e4ce9b6b..43f3bedaafd3 100644 --- a/include/linux/if_addr.h +++ b/include/linux/if_addr.h | |||
@@ -39,6 +39,7 @@ enum | |||
39 | #define IFA_F_TEMPORARY IFA_F_SECONDARY | 39 | #define IFA_F_TEMPORARY IFA_F_SECONDARY |
40 | 40 | ||
41 | #define IFA_F_NODAD 0x02 | 41 | #define IFA_F_NODAD 0x02 |
42 | #define IFA_F_OPTIMISTIC 0x04 | ||
42 | #define IFA_F_HOMEADDRESS 0x10 | 43 | #define IFA_F_HOMEADDRESS 0x10 |
43 | #define IFA_F_DEPRECATED 0x20 | 44 | #define IFA_F_DEPRECATED 0x20 |
44 | #define IFA_F_TENTATIVE 0x40 | 45 | #define IFA_F_TENTATIVE 0x40 |
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index 713eb5eaa81f..e046b22a2222 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h | |||
@@ -178,6 +178,9 @@ struct ipv6_devconf { | |||
178 | #endif | 178 | #endif |
179 | __s32 proxy_ndp; | 179 | __s32 proxy_ndp; |
180 | __s32 accept_source_route; | 180 | __s32 accept_source_route; |
181 | #ifdef CONFIG_IPV6_OPTIMISTIC_DAD | ||
182 | __s32 optimistic_dad; | ||
183 | #endif | ||
181 | void *sysctl; | 184 | void *sysctl; |
182 | }; | 185 | }; |
183 | 186 | ||
@@ -208,6 +211,7 @@ enum { | |||
208 | DEVCONF_PROXY_NDP, | 211 | DEVCONF_PROXY_NDP, |
209 | __DEVCONF_OPTIMISTIC_DAD, | 212 | __DEVCONF_OPTIMISTIC_DAD, |
210 | DEVCONF_ACCEPT_SOURCE_ROUTE, | 213 | DEVCONF_ACCEPT_SOURCE_ROUTE, |
214 | DEVCONF_OPTIMISTIC_DAD, | ||
211 | DEVCONF_MAX | 215 | DEVCONF_MAX |
212 | }; | 216 | }; |
213 | 217 | ||