Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 9 Oct 2009 23:04:15 +0000 (UTC)
From:      Ermal Luçi <eri@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r197915 - in user/eri/pf45/head/sys: contrib/pf/net modules/pf
Message-ID:  <200910092304.n99N4FYs065824@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: eri
Date: Fri Oct  9 23:04:15 2009
New Revision: 197915
URL: http://svn.freebsd.org/changeset/base/197915

Log:
  * Remove unused uma zone in pf 4.5
  * Correct a typo in pf module makefile that has lurked in FreeBSD unbelivably long!!!

Modified:
  user/eri/pf45/head/sys/contrib/pf/net/pf_ioctl.c
  user/eri/pf45/head/sys/contrib/pf/net/pfvar.h
  user/eri/pf45/head/sys/modules/pf/Makefile

Modified: user/eri/pf45/head/sys/contrib/pf/net/pf_ioctl.c
==============================================================================
--- user/eri/pf45/head/sys/contrib/pf/net/pf_ioctl.c	Fri Oct  9 19:30:23 2009	(r197914)
+++ user/eri/pf45/head/sys/contrib/pf/net/pf_ioctl.c	Fri Oct  9 23:04:15 2009	(r197915)
@@ -291,7 +291,6 @@ static struct cdevsw pf_cdevsw = {
         UMA_DESTROY(pf_cache_pl);
         UMA_DESTROY(pf_cent_pl);
         UMA_DESTROY(pfr_ktable_pl);
-        UMA_DESTROY(pfr_kentry_pl2);
         UMA_DESTROY(pfr_kentry_pl);
         UMA_DESTROY(pf_state_scrub_pl);
         UMA_DESTROY(pfi_addr_pl);
@@ -311,7 +310,6 @@ int
                 UMA_CREATE(pf_pooladdr_pl, struct pf_pooladdr, "pfpooladdrpl");
                 UMA_CREATE(pfr_ktable_pl,  struct pfr_ktable, "pfrktable");
                 UMA_CREATE(pfr_kentry_pl,  struct pfr_kentry, "pfrkentry");
-                UMA_CREATE(pfr_kentry_pl2,  struct pfr_kentry, "pfrkentry2");
                 UMA_CREATE(pf_frent_pl,   struct pf_frent, "pffrent");
                 UMA_CREATE(pf_frag_pl,    struct pf_fragment, "pffrag");
                 UMA_CREATE(pf_cache_pl,   struct pf_fragment, "pffrcache");

Modified: user/eri/pf45/head/sys/contrib/pf/net/pfvar.h
==============================================================================
--- user/eri/pf45/head/sys/contrib/pf/net/pfvar.h	Fri Oct  9 19:30:23 2009	(r197914)
+++ user/eri/pf45/head/sys/contrib/pf/net/pfvar.h	Fri Oct  9 23:04:15 2009	(r197915)
@@ -1736,7 +1736,7 @@ extern void			 pf_altq_ifnet_event(struc
 extern uma_zone_t		 pf_src_tree_pl, pf_rule_pl;
 extern uma_zone_t		 pf_state_pl, pf_state_key_pl, pf_state_item_pl,
 				    pf_altq_pl, pf_pooladdr_pl;
-extern uma_zone_t		 pfr_ktable_pl, pfr_kentry_pl, pfr_kentry_pl2;
+extern uma_zone_t		 pfr_ktable_pl, pfr_kentry_pl;
 extern uma_zone_t		 pf_cache_pl, pf_cent_pl;
 extern uma_zone_t		 pf_state_scrub_pl;
 extern uma_zone_t		 pfi_addr_pl;

Modified: user/eri/pf45/head/sys/modules/pf/Makefile
==============================================================================
--- user/eri/pf45/head/sys/modules/pf/Makefile	Fri Oct  9 19:30:23 2009	(r197914)
+++ user/eri/pf45/head/sys/modules/pf/Makefile	Fri Oct  9 23:04:15 2009	(r197915)
@@ -28,7 +28,7 @@ opt_bpf.h:
 # pflog can be loaded as a module, have the additional checks turned on
 opt_pf.h:
 	echo "#define DEV_PF 1" > ${.TARGET}
-	echo "#define DEF_PFLOG 1" >> ${.TARGET}
+	echo "#define DEV_PFLOG 1" >> ${.TARGET}
 .endif
 
 .include <bsd.kmod.mk>

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200910092304.n99N4FYs065824>