Kill sysctl net.inet6.ip6.rr_prune

We don't support Router Renumbering and there are no plans to change
that.  ok mpi@

5 files changed, 9 insertions, 20 deletions

diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
index c4cb4cca162..63d1c1f2287 100644
--- a/lib/libc/gen/sysctl.3
+++ b/lib/libc/gen/sysctl.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sysctl.3,v 1.259 2016/05/29 17:01:07 jmc Exp $
+.\"	$OpenBSD: sysctl.3,v 1.260 2016/06/01 11:11:44 jca Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 29 2016 $
+.Dd $Mdocdate: June 1 2016 $
 .Dt SYSCTL 3
 .Os
 .Sh NAME
@@ -1676,7 +1676,6 @@ The currently defined protocols and names are:
 .It ip6 Ta multipath Ta integer Ta yes
 .It ip6 Ta neighborgcthresh Ta integer Ta yes
 .It ip6 Ta redirect Ta integer Ta yes
-.It ip6 Ta rr_prune Ta integer Ta yes
 .It ip6 Ta use_deprecated Ta integer Ta yes
 .El
 .Pp
@@ -1872,10 +1871,6 @@ Returns 1 when ICMPv6 redirects may be sent by the node.
 This option is ignored unless the node is routing IP packets,
 and should normally be enabled on all systems.
 .Pp
-.It Li ip6.rr_prune
-This variable specifies the interval between IPv6 router renumbering prefix
-babysitting in seconds.
-.Pp
 .It Li ip6.use_deprecated
 This variable controls the use of deprecated addresses, specified in
 RFC 4862 5.5.4.
diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8
index 46c45d80133..7eb69186ae7 100644
--- a/sbin/sysctl/sysctl.8
+++ b/sbin/sysctl/sysctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sysctl.8,v 1.196 2016/05/29 17:01:07 jmc Exp $
+.\"	$OpenBSD: sysctl.8,v 1.197 2016/06/01 11:11:44 jca Exp $
 .\"	$NetBSD: sysctl.8,v 1.4 1995/09/30 07:12:49 thorpej Exp $
 .\"
 .\" Copyright (c) 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)sysctl.8	8.2 (Berkeley) 5/9/95
 .\"
-.Dd $Mdocdate: May 29 2016 $
+.Dd $Mdocdate: June 1 2016 $
 .Dt SYSCTL 8
 .Os
 .Sh NAME
@@ -295,7 +295,6 @@ and a few require a kernel compiled with non-standard
 .It net.inet6.ip6.auto_flowlabel Ta integer Ta yes
 .It net.inet6.ip6.defmcasthlim Ta integer Ta yes
 .It net.inet6.ip6.use_deprecated Ta integer Ta yes
-.It net.inet6.ip6.rr_prune Ta integer Ta yes
 .It net.inet6.ip6.maxfrags Ta integer Ta yes
 .It net.inet6.ip6.mforwarding Ta integer Ta yes
 .It net.inet6.ip6.multipath Ta integer Ta yes
diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h
index 82548d432f9..dc72a346da8 100644
--- a/sys/netinet6/in6.h
+++ b/sys/netinet6/in6.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6.h,v 1.88 2016/05/19 11:34:39 jca Exp $	*/
+/*	$OpenBSD: in6.h,v 1.89 2016/06/01 11:11:44 jca Exp $	*/
 /*	$KAME: in6.h,v 1.83 2001/03/29 02:55:07 jinmei Exp $	*/
 
 /*
@@ -576,7 +576,6 @@ ifatoia6(struct ifaddr *ifa)
 #define IPV6CTL_AUTO_FLOWLABEL	17
 #define IPV6CTL_DEFMCASTHLIM	18
 #define IPV6CTL_USE_DEPRECATED	21	/* use deprecated addr (RFC2462 5.5.4) */
-#define IPV6CTL_RR_PRUNE	22	/* walk timer for router renumbering */
 /* 24 to 40: reserved */
 #define IPV6CTL_MAXFRAGS	41	/* max fragments */
 #define IPV6CTL_MFORWARDING	42
@@ -619,7 +618,7 @@ ifatoia6(struct ifaddr *ifa)
 	{ 0, 0 }, \
 	{ 0, 0 }, \
 	{ "use_deprecated", CTLTYPE_INT }, \
-	{ "rr_prune", CTLTYPE_INT }, \
+	{ 0, 0 }, \
 	{ 0, 0 }, \
 	{ 0, 0 }, \
 	{ 0, 0 }, \
@@ -676,7 +675,7 @@ ifatoia6(struct ifaddr *ifa)
 	NULL, \
 	NULL, \
 	&ip6_use_deprecated, \
-	&ip6_rr_prune, \
+	NULL, \
 	NULL, \
 	NULL, \
 	NULL, \
diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c
index 38da42d6364..8e78a604bb5 100644
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6_proto.c,v 1.85 2016/05/19 11:34:40 jca Exp $	*/
+/*	$OpenBSD: in6_proto.c,v 1.86 2016/06/01 11:11:44 jca Exp $	*/
 /*	$KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $	*/
 
 /*
@@ -279,8 +279,6 @@ int	ip6_dad_count = 1;	/* DupAddrDetectionTransmits */
 int	ip6_dad_pending;	/* number of currently running DADs */
 int	ip6_auto_flowlabel = 1;
 int	ip6_use_deprecated = 1;	/* allow deprecated addr (RFC2462 5.5.4) */
-int	ip6_rr_prune = 5;	/* router renumbering prefix
-				 * walk list every 5 sec.    */
 int	ip6_mcast_pmtu = 0;	/* enable pMTU discovery for multicast? */
 int	ip6_neighborgcthresh = 2048; /* Threshold # of NDP entries for GC */
 int	ip6_maxifprefixes = 16; /* Max acceptable prefixes via RA per IF */
diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h
index 5f6d961b38a..848ad02291d 100644
--- a/sys/netinet6/ip6_var.h
+++ b/sys/netinet6/ip6_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_var.h,v 1.59 2016/05/19 11:34:40 jca Exp $	*/
+/*	$OpenBSD: ip6_var.h,v 1.60 2016/06/01 11:11:44 jca Exp $	*/
 /*	$KAME: ip6_var.h,v 1.33 2000/06/11 14:59:20 jinmei Exp $	*/
 
 /*
@@ -219,8 +219,6 @@ extern int	ip6_mforwarding;	/* act as multicast router? */
 extern int	ip6_multipath;		/* use multipath routes */
 extern int	ip6_sendredirect;	/* send ICMPv6 redirect? */
 extern int	ip6_use_deprecated;	/* allow deprecated addr as source */
-extern int	ip6_rr_prune;		/* router renumbering prefix
-					 * walk list every 5 sec.    */
 extern int	ip6_mcast_pmtu;		/* path MTU discovery for multicast */
 extern int	ip6_neighborgcthresh; /* Threshold # of NDP entries for GC */
 extern int	ip6_maxifprefixes; /* Max acceptable prefixes via RA per IF */