From owner-svn-src-all@freebsd.org Thu Jun 30 01:32:14 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 25C76B85EB3; Thu, 30 Jun 2016 01:32:14 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F1C1A29D3; Thu, 30 Jun 2016 01:32:13 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5U1WDkr093380; Thu, 30 Jun 2016 01:32:13 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5U1WCUa093377; Thu, 30 Jun 2016 01:32:12 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201606300132.u5U1WCUa093377@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Thu, 30 Jun 2016 01:32:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r302289 - head/sys/contrib/ipfilter/netinet X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 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: Thu, 30 Jun 2016 01:32:14 -0000 Author: bz Date: Thu Jun 30 01:32:12 2016 New Revision: 302289 URL: https://svnweb.freebsd.org/changeset/base/302289 Log: Remove unused global variables as well as unused memory allocations from ipfilter in preparation for VNET support. Suggested by: cy (see D7000) Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Approved by: re (gjb) Modified: head/sys/contrib/ipfilter/netinet/ip_fil.h head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c head/sys/contrib/ipfilter/netinet/ip_nat.c Modified: head/sys/contrib/ipfilter/netinet/ip_fil.h ============================================================================== --- head/sys/contrib/ipfilter/netinet/ip_fil.h Wed Jun 29 23:56:24 2016 (r302288) +++ head/sys/contrib/ipfilter/netinet/ip_fil.h Thu Jun 30 01:32:12 2016 (r302289) @@ -1710,7 +1710,6 @@ typedef struct ipf_main_softc_s { #ifndef _KERNEL extern int ipf_check __P((void *, struct ip *, int, void *, int, mb_t **)); -extern int (*ipf_checkp) __P((ip_t *, int, void *, int, mb_t **)); extern struct ifnet *get_unit __P((char *, int)); extern char *get_ifname __P((struct ifnet *)); extern int ipfioctl __P((ipf_main_softc_t *, int, ioctlcmd_t, Modified: head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c ============================================================================== --- head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Wed Jun 29 23:56:24 2016 (r302288) +++ head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Thu Jun 30 01:32:12 2016 (r302289) @@ -99,10 +99,8 @@ MALLOC_DEFINE(M_IPFILTER, "ipfilter", "I # endif -static int (*ipf_savep) __P((void *, ip_t *, int, void *, int, struct mbuf **)); static int ipf_send_ip __P((fr_info_t *, mb_t *)); static void ipf_timer_func __P((void *arg)); -int ipf_locks_done = 0; ipf_main_softc_t ipfmain; @@ -110,10 +108,6 @@ ipf_main_softc_t ipfmain; # if defined(NETBSD_PF) # include # endif /* NETBSD_PF */ -/* - * We provide the ipf_checkp name just to minimize changes later. - */ -int (*ipf_checkp) __P((void *, ip_t *ip, int hlen, void *ifp, int out, mb_t **mp)); static eventhandler_tag ipf_arrivetag, ipf_departtag, ipf_clonetag; @@ -221,11 +215,6 @@ ipfattach(softc) } - if (ipf_checkp != ipf_check) { - ipf_savep = ipf_checkp; - ipf_checkp = ipf_check; - } - bzero((char *)ipfmain.ipf_selwait, sizeof(ipfmain.ipf_selwait)); softc->ipf_running = 1; @@ -268,12 +257,6 @@ ipfdetach(softc) #endif callout_drain(&softc->ipf_slow_ch); -#ifndef NETBSD_PF - if (ipf_checkp != NULL) - ipf_checkp = ipf_savep; - ipf_savep = NULL; -#endif - ipf_fini_all(softc); softc->ipf_running = -2; Modified: head/sys/contrib/ipfilter/netinet/ip_nat.c ============================================================================== --- head/sys/contrib/ipfilter/netinet/ip_nat.c Wed Jun 29 23:56:24 2016 (r302288) +++ head/sys/contrib/ipfilter/netinet/ip_nat.c Thu Jun 30 01:32:12 2016 (r302289) @@ -133,8 +133,6 @@ static const char rcsid[] = "@(#)$FreeBS #define NBUMPSIDEDF(y,x)do { softn->ipf_nat_stats.ns_side[y].x++; \ DT1(x, fr_info_t *, fin); } while (0) -frentry_t ipfnatblock; - static ipftuneable_t ipf_nat_tuneables[] = { /* nat */ { { (void *)offsetof(ipf_nat_softc_t, ipf_nat_lock) }, @@ -275,9 +273,6 @@ static void ipf_nat_tabmove __P((ipf_nat int ipf_nat_main_load() { - bzero((char *)&ipfnatblock, sizeof(ipfnatblock)); - ipfnatblock.fr_flags = FR_BLOCK|FR_QUICK; - ipfnatblock.fr_ref = 1; return 0; }