pointed out by jmc, these sysctls are useless now, too, the kernel no
longer tracks prefixes or default routers from router advertisements.
OK?
diff --git lib/libc/gen/sysctl.3 lib/libc/gen/sysctl.3
index 0ac92a5c079..e6d3d092b2f 100644
--- lib/libc/gen/sysctl.3
+++ lib/libc/gen/sysctl.3
@@ -1654,8 +1654,6 @@ The currently defined protocols and names are:
.It ip6 Ta maxdynroutes Ta integer Ta yes
.It ip6 Ta maxfragpackets Ta integer Ta yes
.It ip6 Ta maxfrags Ta integer Ta yes
-.It ip6 Ta maxifprefixes Ta integer Ta yes
-.It ip6 Ta maxifdefrouters Ta integer Ta yes
.It ip6 Ta mforwarding Ta integer Ta yes
.It ip6 Ta mtudisctimeout Ta integer Ta yes
.It ip6 Ta multicast_mtudisc Ta integer Ta yes
@@ -1814,17 +1812,6 @@ The maximum number of fragments the node will accept.
\-1 means that the node will accept as many fragments as it receives.
The flag is provided basically for avoiding possible DoS attacks.
.Pp
-.It Li ip6.maxifprefixes Pq Va net.inet6.ip6.maxifprefixes
-Maximum number of prefixes created by route advertisements per interface.
-Set to negative to disable.
-The default value is 16.
-.Pp
-.It Li ip6.maxifdefrouters Pq Va net.inet6.ip6.maxifdefrouters
-Maximum number of default routers created by route advertisements per
-interface.
-Set to negative to disable.
-The default value is 16.
-.Pp
.It Li ip6.mforwarding Pq Va net.inet6.ip6.mforwarding
If set to 1, then multicast forwarding is enabled for the host.
The default is 0.
diff --git sys/netinet6/in6.h sys/netinet6/in6.h
index 1aac6581916..2af7d987335 100644
--- sys/netinet6/in6.h
+++ sys/netinet6/in6.h
@@ -584,8 +584,6 @@ ifatoia6(struct ifaddr *ifa)
#define IPV6CTL_MULTIPATH 43
#define IPV6CTL_MCAST_PMTU 44 /* path MTU discovery for multicast */
#define IPV6CTL_NEIGHBORGCTHRESH 45
-#define IPV6CTL_MAXIFPREFIXES 46
-#define IPV6CTL_MAXIFDEFROUTERS 47
#define IPV6CTL_MAXDYNROUTES 48
#define IPV6CTL_DAD_PENDING49
#define IPV6CTL_MTUDISCTIMEOUT 50
@@ -644,8 +642,8 @@ ifatoia6(struct ifaddr *ifa)
{ "multipath", CTLTYPE_INT }, \
{ "multicast_mtudisc", CTLTYPE_INT }, \
{ "neighborgcthresh", CTLTYPE_INT }, \
- { "maxifprefixes", CTLTYPE_INT }, \
- { "maxifdefrouters", CTLTYPE_INT }, \
+ { 0, 0 }, \
+ { 0, 0 }, \
{ "maxdynroutes", CTLTYPE_INT }, \
{ "dad_pending", CTLTYPE_INT }, \
{ "mtudisctimeout", CTLTYPE_INT }, \
@@ -701,8 +699,8 @@ ifatoia6(struct ifaddr *ifa)
_multipath, \
_mcast_pmtu, \
_neighborgcthresh, \
- _maxifprefixes, \
- _maxifdefrouters, \
+ NULL, \
+ NULL, \
_maxdynroutes, \
NULL, \
NULL, \
diff --git sys/netinet6/in6_proto.c sys/netinet6/in6_proto.c
index e2294ed1cb4..2353571afd6 100644
--- sys/netinet6/in6_proto.c
+++ sys/netinet6/in6_proto.c
@@ -360,8 +360,6 @@ int ip6_auto_flowlabel = 1;
intip6_use_deprecated = 1; /* allow deprecated addr (RFC2462 5.5.4) */
intip6_mcast_pmtu = 0; /* enable pMTU discovery for multicast? */
intip6_neighborgcthresh = 2048; /* Threshold # of NDP entries for GC */
-intip6_maxifprefixes = 16; /* Max acceptable prefixes via RA per IF */
-intip6_maxifdefrouters = 16; /* Max acceptable def routers via RA */
intip6_maxdynroutes = 4096; /* Max # of routes created via redirect */
time_t ip6_log_time = (time_t)0L;
diff --git sys/netinet6/ip6_var.h sys/netinet6/ip6_var.h
index 9b58d9ee0af..45225f272fa 100644
--- sys/netinet6/ip6_var.h
+++ sys/netinet6/ip6_var.h
@@ -279,8 +279,6 @@ extern int ip6_sendredirect; /* send ICMPv6
redirect? */
extern int ip6_use_deprecated; /* allow deprecated addr as source */
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 */
-extern int ip6_maxifdefrouters; /* Max acceptable def routers via RA */
extern int ip6_maxdynroutes; /* Max # of routes created via redirect */
extern struct socket *ip6_mrouter[RT_TABLEID_MAX]; /* multicast routing daemon
*/
--
I'm not entirely sure you are real.
