From owner-svn-src-all@FreeBSD.ORG Mon Mar 2 22:11:49 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E0957106567F; Mon, 2 Mar 2009 22:11:49 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A9F7F8FC1A; Mon, 2 Mar 2009 22:11:49 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n22MBn5E087520; Mon, 2 Mar 2009 22:11:49 GMT (envelope-from luigi@svn.freebsd.org) Received: (from luigi@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n22MBndb087518; Mon, 2 Mar 2009 22:11:49 GMT (envelope-from luigi@svn.freebsd.org) Message-Id: <200903022211.n22MBndb087518@svn.freebsd.org> From: Luigi Rizzo Date: Mon, 2 Mar 2009 22:11:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189288 - head/sys/netinet X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Mar 2009 22:11:53 -0000 Author: luigi Date: Mon Mar 2 22:11:48 2009 New Revision: 189288 URL: http://svn.freebsd.org/changeset/base/189288 Log: fw_debug has been unused for ages, so remove it from the list of sysctl_variables. I would also remove it from the VNET record but I am unsure if there is any ABI issue -- so for the time being just mark it as unused in ip_fw.h, and then we will collect the garbage at some appropriate time in the future. MFC after: 3 days Modified: head/sys/netinet/ip_fw.h head/sys/netinet/ip_fw2.c Modified: head/sys/netinet/ip_fw.h ============================================================================== --- head/sys/netinet/ip_fw.h Mon Mar 2 20:51:39 2009 (r189287) +++ head/sys/netinet/ip_fw.h Mon Mar 2 22:11:48 2009 (r189288) @@ -693,7 +693,7 @@ struct vnet_ipfw { int _fw_deny_unknown_exthdrs; int _fw_verbose; int _verbose_limit; - int _fw_debug; + int _fw_debug; /* actually unused */ int _autoinc_step; ipfw_dyn_rule **_ipfw_dyn_v; struct ip_fw_chain _layer3_chain; Modified: head/sys/netinet/ip_fw2.c ============================================================================== --- head/sys/netinet/ip_fw2.c Mon Mar 2 20:51:39 2009 (r189287) +++ head/sys/netinet/ip_fw2.c Mon Mar 2 22:11:48 2009 (r189288) @@ -165,7 +165,6 @@ struct table_entry { }; #ifdef VIMAGE_GLOBALS -static int fw_debug; static int autoinc_step; #endif @@ -181,8 +180,6 @@ SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip_fw, OID_AUTO, one_pass, CTLFLAG_RW | CTLFLAG_SECURE3, fw_one_pass, 0, "Only do a single pass through ipfw when using dummynet(4)"); -SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, debug, CTLFLAG_RW, - fw_debug, 0, "Enable printing of debug ip_fw statements"); SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, verbose, CTLFLAG_RW | CTLFLAG_SECURE3, fw_verbose, 0, "Log matches to ipfw rules"); @@ -4535,7 +4532,6 @@ ipfw_init(void) struct ip_fw default_rule; int error; - V_fw_debug = 1; V_autoinc_step = 100; /* bounded to 1..1000 in add_rule() */ V_ipfw_dyn_v = NULL;