From nobody@FreeBSD.org  Sat Dec  1 11:11:38 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 26FE6CC
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  1 Dec 2012 11:11:38 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id E9B078FC0C
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  1 Dec 2012 11:11:37 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id qB1BBbal006125
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 1 Dec 2012 11:11:37 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id qB1BBbOU006113;
	Sat, 1 Dec 2012 11:11:37 GMT
	(envelope-from nobody)
Message-Id: <201212011111.qB1BBbOU006113@red.freebsd.org>
Date: Sat, 1 Dec 2012 11:11:37 GMT
From: Garrett Cooper <yaneurabeya@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] prune unused net.inet6 sysctls
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         174033
>Category:       kern
>Synopsis:       [patch] prune unused net.inet6 sysctls
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    hrs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 01 11:20:00 UTC 2012
>Closed-Date:    
>Last-Modified:  Sun Feb 03 22:31:36 UTC 2013
>Originator:     Garrett Cooper
>Release:        10-CURRENT
>Organization:
EMC Isilon
>Environment:
FreeBSD bayonetta.local 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #0 r240836M: Sat Sep 22 12:30:11 PDT 2012     gcooper@bayonetta.local:/usr/obj/store/freebsd/stable/9/sys/BAYONETTA  amd64
>Description:
When documenting the net.inet6 sysctls I noticed that 2 sysctls aren't actually in used in the mainline kernel:

net.inet6.icmp6_redirtimeout
net.inet6.ip6_rr_prune
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: sys/netinet6/in6_proto.c
===================================================================
--- sys/netinet6/in6_proto.c	(revision 243747)
+++ sys/netinet6/in6_proto.c	(working copy)
@@ -409,8 +409,6 @@
 VNET_DEFINE(int, ip6_auto_flowlabel) = 1;
 VNET_DEFINE(int, ip6_use_deprecated) = 1;/* allow deprecated addr
 					 * (RFC2462 5.5.4) */
-VNET_DEFINE(int, ip6_rr_prune) = 5;	/* router renumbering prefix
-					 * walk list every 5 sec. */
 VNET_DEFINE(int, ip6_mcast_pmtu) = 0;	/* enable pMTU discovery for multicast? */
 VNET_DEFINE(int, ip6_v6only) = 1;
 
@@ -443,7 +441,6 @@
 
 /* ICMPV6 parameters */
 VNET_DEFINE(int, icmp6_rediraccept) = 1;/* accept and process redirects */
-VNET_DEFINE(int, icmp6_redirtimeout) = 10 * 60;	/* 10 minutes */
 VNET_DEFINE(int, icmp6errppslim) = 100;		/* 100pps */
 /* control how to respond to NI queries */
 VNET_DEFINE(int, icmp6_nodeinfo) =
@@ -557,8 +554,6 @@
 	CTLFLAG_RD, __KAME_VERSION, 0, "");
 SYSCTL_VNET_INT(_net_inet6_ip6, IPV6CTL_USE_DEPRECATED, use_deprecated,
 	CTLFLAG_RW, &VNET_NAME(ip6_use_deprecated), 0, "");
-SYSCTL_VNET_INT(_net_inet6_ip6, IPV6CTL_RR_PRUNE, rr_prune, CTLFLAG_RW,
-	&VNET_NAME(ip6_rr_prune), 0, "");
 SYSCTL_VNET_INT(_net_inet6_ip6, IPV6CTL_USETEMPADDR, use_tempaddr,
 	CTLFLAG_RW, &VNET_NAME(ip6_use_tempaddr), 0, "");
 SYSCTL_VNET_PROC(_net_inet6_ip6, IPV6CTL_TEMPPLTIME, temppltime,
@@ -601,8 +596,6 @@
 /* net.inet6.icmp6 */
 SYSCTL_VNET_INT(_net_inet6_icmp6, ICMPV6CTL_REDIRACCEPT, rediraccept,
 	CTLFLAG_RW, &VNET_NAME(icmp6_rediraccept), 0, "");
-SYSCTL_VNET_INT(_net_inet6_icmp6, ICMPV6CTL_REDIRTIMEOUT, redirtimeout,
-	CTLFLAG_RW, &VNET_NAME(icmp6_redirtimeout), 0, "");
 SYSCTL_VNET_STRUCT(_net_inet6_icmp6, ICMPV6CTL_STATS, stats, CTLFLAG_RW,
 	&VNET_NAME(icmp6stat), icmp6stat, "");
 SYSCTL_VNET_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_PRUNE, nd6_prune, CTLFLAG_RW,


>Release-Note:
>Audit-Trail:

From: Garrett Cooper <yaneurabeya@gmail.com>
To: bug-followup@FreeBSD.org
Cc: yanegomi@gmail.com
Subject: Re: kern/174033: [patch] prune unused net.inet6 sysctls
Date: Sun, 2 Dec 2012 16:53:27 -0800 (PST)

   This message is in MIME format.  The first part should be readable text,
   while the remaining parts are likely unreadable without MIME-aware tools.
 
 --967339439-1883153408-1354496011=:40134
 Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII
 
  	Forgot to submit the other part of the patch to remove the 
 icmp6_redirtimeout VNET declarations. This should be applied in addition 
 to the other submitted patch.
 Thanks,
 -Garrett
 --967339439-1883153408-1354496011=:40134
 Content-Type: TEXT/PLAIN; charset=US-ASCII; name=prune_unused_net_inet6_sysctls-part2.patch.txt
 Content-Transfer-Encoding: BASE64
 Content-ID: <alpine.BSF.2.00.1212021653270.40134@toaster.local>
 Content-Description: 
 Content-Disposition: attachment; filename=prune_unused_net_inet6_sysctls-part2.patch.txt
 
 SW5kZXg6IHN5cy9uZXRpbmV0L2ljbXA2LmgNCj09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT0NCi0tLSBzeXMvbmV0aW5ldC9pY21wNi5oCShyZXZpc2lvbiAyNDM1
 NTcpDQorKysgc3lzL25ldGluZXQvaWNtcDYuaAkod29ya2luZyBjb3B5KQ0K
 QEAgLTc0NCwxMCArNzQ0LDggQEANCiB9IHdoaWxlICgvKkNPTlNUQ09ORCov
 IDApDQogDQogVk5FVF9ERUNMQVJFKGludCwgaWNtcDZfcmVkaXJhY2NlcHQp
 OwkvKiBhY2NlcHQvcHJvY2VzcyByZWRpcmVjdHMgKi8NCi1WTkVUX0RFQ0xB
 UkUoaW50LCBpY21wNl9yZWRpcnRpbWVvdXQpOwkvKiBjYWNoZSB0aW1lIGZv
 ciByZWRpcmVjdCByb3V0ZXMgKi8NCiANCiAjZGVmaW5lCVZfaWNtcDZfcmVk
 aXJhY2NlcHQJVk5FVChpY21wNl9yZWRpcmFjY2VwdCkNCi0jZGVmaW5lCVZf
 aWNtcDZfcmVkaXJ0aW1lb3V0CVZORVQoaWNtcDZfcmVkaXJ0aW1lb3V0KQ0K
 IA0KICNkZWZpbmUgSUNNUDZfTk9ERUlORk9fRlFETk9LCQkweDENCiAjZGVm
 aW5lIElDTVA2X05PREVJTkZPX05PREVBRERST0sJMHgyDQo=
 
 --967339439-1883153408-1354496011=:40134--
Responsible-Changed-From-To: freebsd-bugs->hrs 
Responsible-Changed-By: hrs 
Responsible-Changed-When: Thu Jan 3 22:45:26 UTC 2013 
Responsible-Changed-Why:  
I will take this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=174033 
>Unformatted:
