diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-09-30 16:16:21 +0900 |
|---|---|---|
| committer | Lorenzo Colitti <lorenzo@google.com> | 2015-09-30 16:34:12 +0900 |
| commit | 2615626213b4e849e3400bf4a8b2cd6c4a9ce6c7 (patch) | |
| tree | 365d823bebe657ae6f0fcc8a1f7489085fa0c8a3 /include | |
| parent | 206ade8321539e73c15e21df20ef1d5baf2083ea (diff) | |
Revert "net: ipv6: Add a sysctl to make optimistic addresses useful candidates"
This reverts commit 3cf53d82e2a77a2c23ccfda7fa1f0d5646bda67e.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ipv6.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/ipv6.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index b8476f016354..36549979c6b8 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h @@ -43,7 +43,6 @@ struct ipv6_devconf { __s32 accept_ra_from_local; #ifdef CONFIG_IPV6_OPTIMISTIC_DAD __s32 optimistic_dad; - __s32 use_optimistic; #endif #ifdef CONFIG_IPV6_MROUTE __s32 mc_forwarding; diff --git a/include/uapi/linux/ipv6.h b/include/uapi/linux/ipv6.h index 187d9f6ccb0a..22bd2111d3a8 100644 --- a/include/uapi/linux/ipv6.h +++ b/include/uapi/linux/ipv6.h @@ -165,7 +165,6 @@ enum { DEVCONF_MLDV2_UNSOLICITED_REPORT_INTERVAL, DEVCONF_SUPPRESS_FRAG_NDISC, DEVCONF_ACCEPT_RA_FROM_LOCAL, - DEVCONF_USE_OPTIMISTIC, DEVCONF_MAX }; |