svn commit: r236554 - projects/pf/head/sys/contrib/pf/net

[Gleb Smirnoff]

Author: glebius
Date: Mon Jun  4 10:09:57 2012
New Revision: 236554
URL: http://svn.freebsd.org/changeset/base/236554

Log:
  Consistent names for pf(4) malloc(9) types.

Modified:
  projects/pf/head/sys/contrib/pf/net/if_pfsync.c
  projects/pf/head/sys/contrib/pf/net/pf.c
  projects/pf/head/sys/contrib/pf/net/pf_if.c
  projects/pf/head/sys/contrib/pf/net/pf_ioctl.c

Modified: projects/pf/head/sys/contrib/pf/net/if_pfsync.c
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/if_pfsync.c	Mon Jun  4 09:55:47 2012	(r236553)
+++ projects/pf/head/sys/contrib/pf/net/if_pfsync.c	Mon Jun  4 10:09:57 2012	(r236554)
@@ -238,7 +238,7 @@ struct pfsync_softc {
 #define	PFSYNC_BUNLOCK(sc)	mtx_unlock(&(sc)->sc_bulk_mtx)
 #define	PFSYNC_BLOCK_ASSERT(sc)	mtx_assert(&(sc)->sc_bulk_mtx, MA_OWNED)
 
-static MALLOC_DEFINE(M_PFSYNC, "pfsync", "pfsync data");
+static MALLOC_DEFINE(M_PFSYNC, "pfsync(4)", "pfsync(4) data");
 static VNET_DEFINE(struct pfsync_softc	*, pfsyncif) = NULL;
 #define	V_pfsyncif		VNET(pfsyncif)
 static VNET_DEFINE(void *, pfsync_swi_cookie) = NULL;

Modified: projects/pf/head/sys/contrib/pf/net/pf.c
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/pf.c	Mon Jun  4 09:55:47 2012	(r236553)
+++ projects/pf/head/sys/contrib/pf/net/pf.c	Mon Jun  4 10:09:57 2012	(r236554)
@@ -155,7 +155,7 @@ VNET_DEFINE(struct pf_anchor_stackframe,
 /*
  * Queue for pf_intr() sends.
  */
-MALLOC_DEFINE(M_PFTEMP, "pf temp", "pf(4) temporary allocations");
+static MALLOC_DEFINE(M_PFTEMP, "pf(4) temp", "pf(4) temporary allocations");
 struct pf_send_entry {
 	STAILQ_ENTRY(pf_send_entry)	pfse_next;
 	struct mbuf			*pfse_m;
@@ -350,7 +350,7 @@ VNET_DEFINE(struct pf_limit, pf_limits[P
 		s->rule.ptr->states_cur--;		\
 	} while (0)
 
-MALLOC_DEFINE(M_PFHASH, "pf hashes", "pf(4) hash header structures");
+static MALLOC_DEFINE(M_PFHASH, "pf(4) hash", "pf(4) hash header structures");
 /* XXXGL: make static? */
 VNET_DEFINE(struct pf_keyhash *, pf_keyhash);
 VNET_DEFINE(struct pf_idhash *, pf_idhash);

Modified: projects/pf/head/sys/contrib/pf/net/pf_if.c
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/pf_if.c	Mon Jun  4 09:55:47 2012	(r236553)
+++ projects/pf/head/sys/contrib/pf/net/pf_if.c	Mon Jun  4 10:09:57 2012	(r236554)
@@ -110,7 +110,7 @@ static VNET_DEFINE(struct pfi_ifhead, pf
 #define	V_pfi_ifs	VNET(pfi_ifs)
 
 #define	PFI_BUFFER_MAX		0x10000
-MALLOC_DEFINE(PFI_MTYPE, "pf ifnets", "pf interface database");
+MALLOC_DEFINE(PFI_MTYPE, "pf(4) ifnets", "pf(4) interface database");
 
 LIST_HEAD(pfi_list, pfi_kif);
 static VNET_DEFINE(struct pfi_list, pfi_unlinked_kifs);

Modified: projects/pf/head/sys/contrib/pf/net/pf_ioctl.c
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/pf_ioctl.c	Mon Jun  4 09:55:47 2012	(r236553)
+++ projects/pf/head/sys/contrib/pf/net/pf_ioctl.c	Mon Jun  4 10:09:57 2012	(r236554)
@@ -157,8 +157,8 @@ TAILQ_HEAD(pf_tags, pf_tagname);
 VNET_DEFINE(struct pf_tags, pf_tags);
 #define	V_pf_qids		VNET(pf_qids)
 VNET_DEFINE(struct pf_tags, pf_qids);
-MALLOC_DEFINE(M_PFTAG, "pf tags", "pf tags");
-MALLOC_DEFINE(M_PFALTQ, "pf(4) altq", "pf(4) altq configuration db");
+static MALLOC_DEFINE(M_PFTAG, "pf(4) tag", "pf(4) tag names");
+static MALLOC_DEFINE(M_PFALTQ, "pf(4) altq", "pf(4) altq configuration db");
 
 #if (PF_QNAME_SIZE != PF_TAG_NAME_SIZE)
 #error PF_QNAME_SIZE must be equal to PF_TAG_NAME_SIZE