Remove "pl" suffix on pool names.

ok dlg@, uebayasi@, mikeb@

5 files changed, 16 insertions, 20 deletions

diff --git a/sys/net/pipex.c b/sys/net/pipex.c
index a0622ab6177..eaa545af322 100644
--- a/sys/net/pipex.c
+++ b/sys/net/pipex.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pipex.c,v 1.61 2014/10/28 09:45:37 yasuoka Exp $	*/
+/*	$OpenBSD: pipex.c,v 1.62 2014/11/04 15:24:40 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -136,9 +136,9 @@ pipex_init(void)
 		return;
 
 	pool_init(&pipex_session_pool, sizeof(struct pipex_session), 0, 0, 0,
-	    "ppxsspl", NULL);
-	pool_init(&mppe_key_pool, PIPEX_MPPE_KEYLEN * PIPEX_MPPE_NOLDKEY, 0, 0, 0,
-	    "mppekeypl", NULL);
+	    "ppxss", NULL);
+	pool_init(&mppe_key_pool, PIPEX_MPPE_KEYLEN * PIPEX_MPPE_NOLDKEY, 0, 0,
+	    0, "mppekey", NULL);
 
 	LIST_INIT(&pipex_session_list);
 	LIST_INIT(&pipex_close_wait_list);
diff --git a/sys/net/route.c b/sys/net/route.c
index 33083a5a7fd..210a1351aff 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.c,v 1.188 2014/11/01 21:40:38 mpi Exp $	*/
+/*	$OpenBSD: route.c,v 1.189 2014/11/04 15:24:40 mpi Exp $	*/
 /*	$NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $	*/
 
 /*
@@ -215,7 +215,7 @@ route_init(void)
 {
 	struct domain	 *dom;
 
-	pool_init(&rtentry_pool, sizeof(struct rtentry), 0, 0, 0, "rtentpl",
+	pool_init(&rtentry_pool, sizeof(struct rtentry), 0, 0, 0, "rtent",
 	    NULL);
 	rn_init();	/* initialize all zeroes, all ones, mask table */
 
@@ -1309,7 +1309,7 @@ rt_timer_init()
 	if (rt_init_done)
 		panic("rt_timer_init: already initialized");
 
-	pool_init(&rttimer_pool, sizeof(struct rttimer), 0, 0, 0, "rttmrpl",
+	pool_init(&rttimer_pool, sizeof(struct rttimer), 0, 0, 0, "rttmr",
 	    NULL);
 
 	LIST_INIT(&rttimer_queue_head);
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 63496171a1b..ab1cac3b971 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_input.c,v 1.239 2014/11/01 21:40:38 mpi Exp $	*/
+/*	$OpenBSD: ip_input.c,v 1.240 2014/11/04 15:24:40 mpi Exp $	*/
 /*	$NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $	*/
 
 /*
@@ -155,10 +155,8 @@ ip_init(void)
 	const u_int16_t defbaddynamicports_tcp[] = DEFBADDYNAMICPORTS_TCP;
 	const u_int16_t defbaddynamicports_udp[] = DEFBADDYNAMICPORTS_UDP;
 
-	pool_init(&ipqent_pool, sizeof(struct ipqent), 0, 0, 0, "ipqepl",
-	    NULL);
-	pool_init(&ipq_pool, sizeof(struct ipq), 0, 0, 0, "ipqpl",
-	    NULL);
+	pool_init(&ipqent_pool, sizeof(struct ipqent), 0, 0, 0, "ipqe",  NULL);
+	pool_init(&ipq_pool, sizeof(struct ipq), 0, 0, 0, "ipq", NULL);
 
 	pr = pffindproto(PF_INET, IPPROTO_RAW, SOCK_RAW);
 	if (pr == 0)
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 09c7b728717..9b1b458c243 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_input.c,v 1.281 2014/10/24 17:58:47 bluhm Exp $	*/
+/*	$OpenBSD: tcp_input.c,v 1.282 2014/11/04 15:24:40 mpi Exp $	*/
 /*	$NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $	*/
 
 /*
@@ -3409,7 +3409,7 @@ syn_cache_init()
 
 	/* Initialize the syn cache pool. */
 	pool_init(&syn_cache_pool, sizeof(struct syn_cache), 0, 0, 0,
-	    "synpl", NULL);
+	    "syncache", NULL);
 }
 
 void
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index 768c2b76821..d46914a5e00 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_subr.c,v 1.133 2014/10/20 03:43:40 tedu Exp $	*/
+/*	$OpenBSD: tcp_subr.c,v 1.134 2014/11/04 15:24:40 mpi Exp $	*/
 /*	$NetBSD: tcp_subr.c,v 1.22 1996/02/13 23:44:00 christos Exp $	*/
 
 /*
@@ -151,13 +151,11 @@ void
 tcp_init()
 {
 	tcp_iss = 1;		/* wrong */
-	pool_init(&tcpcb_pool, sizeof(struct tcpcb), 0, 0, 0, "tcpcbpl",
-	    NULL);
-	pool_init(&tcpqe_pool, sizeof(struct tcpqent), 0, 0, 0, "tcpqepl",
-	    NULL);
+	pool_init(&tcpcb_pool, sizeof(struct tcpcb), 0, 0, 0, "tcpcb", NULL);
+	pool_init(&tcpqe_pool, sizeof(struct tcpqent), 0, 0, 0, "tcpqe", NULL);
 	pool_sethardlimit(&tcpqe_pool, tcp_reass_limit, NULL, 0);
 #ifdef TCP_SACK
-	pool_init(&sackhl_pool, sizeof(struct sackhole), 0, 0, 0, "sackhlpl",
+	pool_init(&sackhl_pool, sizeof(struct sackhole), 0, 0, 0, "sackhl",
 	    NULL);
 	pool_sethardlimit(&sackhl_pool, tcp_sackhole_limit, NULL, 0);
 #endif /* TCP_SACK */