svn commit: r222496 - in stable/8/sys: kern netinet netinet/cc

[Sergey Kandaurov]

Author: pluknet
Date: Mon May 30 11:24:03 2011
New Revision: 222496
URL: http://svn.freebsd.org/changeset/base/222496

Log:
  MFC r220592: Staticize malloc types.
  
  Approved by:	lstewart

Modified:
  stable/8/sys/kern/kern_hhook.c
  stable/8/sys/netinet/cc/cc_chd.c
  stable/8/sys/netinet/cc/cc_cubic.c
  stable/8/sys/netinet/cc/cc_htcp.c
  stable/8/sys/netinet/cc/cc_vegas.c
  stable/8/sys/netinet/siftr.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/kern/kern_hhook.c
==============================================================================
--- stable/8/sys/kern/kern_hhook.c	Mon May 30 11:17:42 2011	(r222495)
+++ stable/8/sys/kern/kern_hhook.c	Mon May 30 11:24:03 2011	(r222496)
@@ -58,8 +58,7 @@ struct hhook {
 	STAILQ_ENTRY(hhook)	hhk_next;
 };
 
-MALLOC_DECLARE(M_HHOOK);
-MALLOC_DEFINE(M_HHOOK, "hhook", "Helper hooks are linked off hhook_head lists");
+static MALLOC_DEFINE(M_HHOOK, "hhook", "Helper hooks are linked off hhook_head lists");
 
 LIST_HEAD(hhookheadhead, hhook_head);
 VNET_DEFINE(struct hhookheadhead, hhook_head_list);

Modified: stable/8/sys/netinet/cc/cc_chd.c
==============================================================================
--- stable/8/sys/netinet/cc/cc_chd.c	Mon May 30 11:17:42 2011	(r222495)
+++ stable/8/sys/netinet/cc/cc_chd.c	Mon May 30 11:24:03 2011	(r222496)
@@ -127,8 +127,7 @@ static VNET_DEFINE(uint32_t, chd_qthresh
 #define	V_chd_loss_fair	VNET(chd_loss_fair)
 #define	V_chd_use_max	VNET(chd_use_max)
 
-MALLOC_DECLARE(M_CHD);
-MALLOC_DEFINE(M_CHD, "chd data",
+static MALLOC_DEFINE(M_CHD, "chd data",
     "Per connection data required for the CHD congestion control algorithm");
 
 struct cc_algo chd_cc_algo = {

Modified: stable/8/sys/netinet/cc/cc_cubic.c
==============================================================================
--- stable/8/sys/netinet/cc/cc_cubic.c	Mon May 30 11:17:42 2011	(r222495)
+++ stable/8/sys/netinet/cc/cc_cubic.c	Mon May 30 11:24:03 2011	(r222496)
@@ -98,8 +98,7 @@ struct cubic {
 	int		t_last_cong;
 };
 
-MALLOC_DECLARE(M_CUBIC);
-MALLOC_DEFINE(M_CUBIC, "cubic data",
+static MALLOC_DEFINE(M_CUBIC, "cubic data",
     "Per connection data required for the CUBIC congestion control algorithm");
 
 struct cc_algo cubic_cc_algo = {

Modified: stable/8/sys/netinet/cc/cc_htcp.c
==============================================================================
--- stable/8/sys/netinet/cc/cc_htcp.c	Mon May 30 11:17:42 2011	(r222495)
+++ stable/8/sys/netinet/cc/cc_htcp.c	Mon May 30 11:24:03 2011	(r222496)
@@ -173,8 +173,7 @@ static VNET_DEFINE(uint8_t, htcp_rtt_sca
 #define	V_htcp_adaptive_backoff    VNET(htcp_adaptive_backoff)
 #define	V_htcp_rtt_scaling    VNET(htcp_rtt_scaling)
 
-MALLOC_DECLARE(M_HTCP);
-MALLOC_DEFINE(M_HTCP, "htcp data",
+static MALLOC_DEFINE(M_HTCP, "htcp data",
     "Per connection data required for the HTCP congestion control algorithm");
 
 struct cc_algo htcp_cc_algo = {

Modified: stable/8/sys/netinet/cc/cc_vegas.c
==============================================================================
--- stable/8/sys/netinet/cc/cc_vegas.c	Mon May 30 11:17:42 2011	(r222495)
+++ stable/8/sys/netinet/cc/cc_vegas.c	Mon May 30 11:24:03 2011	(r222496)
@@ -105,8 +105,7 @@ static VNET_DEFINE(uint32_t, vegas_beta)
 #define	V_vegas_alpha	VNET(vegas_alpha)
 #define	V_vegas_beta	VNET(vegas_beta)
 
-MALLOC_DECLARE(M_VEGAS);
-MALLOC_DEFINE(M_VEGAS, "vegas data",
+static MALLOC_DEFINE(M_VEGAS, "vegas data",
     "Per connection data required for the Vegas congestion control algorithm");
 
 struct cc_algo vegas_cc_algo = {

Modified: stable/8/sys/netinet/siftr.c
==============================================================================
--- stable/8/sys/netinet/siftr.c	Mon May 30 11:17:42 2011	(r222495)
+++ stable/8/sys/netinet/siftr.c	Mon May 30 11:24:03 2011	(r222496)
@@ -156,14 +156,11 @@ __FBSDID("$FreeBSD$");
 #define THIRD_OCTET(X)	(((X) & 0x0000FF00) >> 8)
 #define FOURTH_OCTET(X)	((X) & 0x000000FF)
 
-MALLOC_DECLARE(M_SIFTR);
-MALLOC_DEFINE(M_SIFTR, "siftr", "dynamic memory used by SIFTR");
-
-MALLOC_DECLARE(M_SIFTR_PKTNODE);
-MALLOC_DEFINE(M_SIFTR_PKTNODE, "siftr_pktnode", "SIFTR pkt_node struct");
-
-MALLOC_DECLARE(M_SIFTR_HASHNODE);
-MALLOC_DEFINE(M_SIFTR_HASHNODE, "siftr_hashnode", "SIFTR flow_hash_node struct");
+static MALLOC_DEFINE(M_SIFTR, "siftr", "dynamic memory used by SIFTR");
+static MALLOC_DEFINE(M_SIFTR_PKTNODE, "siftr_pktnode",
+    "SIFTR pkt_node struct");
+static MALLOC_DEFINE(M_SIFTR_HASHNODE, "siftr_hashnode",
+    "SIFTR flow_hash_node struct");
 
 /* Used as links in the pkt manager queue. */
 struct pkt_node {