summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-04-25 15:33:55 -0400
committerDavid S. Miller <davem@davemloft.net>2016-04-25 15:33:55 -0400
commit841645b5f2dfceac69b78fcd0c9050868d41ea61 (patch)
tree44a1995c24adf052187020ade737a58bfb9fa0b5 /include
parent391a20333b8393ef2e13014e6e59d192c5594471 (diff)
downloadlinux-841645b5f2dfceac69b78fcd0c9050868d41ea61.tar.gz
linux-841645b5f2dfceac69b78fcd0c9050868d41ea61.tar.bz2
linux-841645b5f2dfceac69b78fcd0c9050868d41ea61.zip
ipv6: Revert optional address flusing on ifdown.
This reverts the following three commits: 70af921db6f8835f4b11c65731116560adb00c14 799977d9aafbf0ca0b9c39b04cbfb16db71302c9 f1705ec197e705b79ea40fe7a2cc5acfa1d3bfac The feature was ill conceived, has terrible semantics, and has added nothing but regressions to the already fragile ipv6 stack. Fixes: f1705ec197e7 ("net: ipv6: Make address flushing on ifdown optional") Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/linux/ipv6.h1
-rw-r--r--include/uapi/linux/ipv6.h1
2 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 7edc14fb66b6..4b2267e1b7c3 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -62,7 +62,6 @@ struct ipv6_devconf {
struct in6_addr secret;
} stable_secret;
__s32 use_oif_addrs_only;
- __s32 keep_addr_on_down;
void *sysctl;
};
diff --git a/include/uapi/linux/ipv6.h b/include/uapi/linux/ipv6.h
index 395876060f50..ec117b65d5a5 100644
--- a/include/uapi/linux/ipv6.h
+++ b/include/uapi/linux/ipv6.h
@@ -176,7 +176,6 @@ enum {
DEVCONF_IGNORE_ROUTES_WITH_LINKDOWN,
DEVCONF_DROP_UNICAST_IN_L2_MULTICAST,
DEVCONF_DROP_UNSOLICITED_NA,
- DEVCONF_KEEP_ADDR_ON_DOWN,
DEVCONF_MAX
};