diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2014-02-04 01:04:04 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2014-02-04 01:04:04 +0000 |
| commit | af908ec97f18b43bcc18f6c1b57a56d1ab63b7e6 (patch) | |
| tree | 9a2978266d777bde42ca8f9a0dfdc47073c892e4 /sys/net | |
| parent | 5f95f05a97673149c036dfd0c9dabbbf1c958b34 (diff) | |
reduce the length of some pool names. ok deraadt guenther mpi
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if.c | 4 | ||||
| -rw-r--r-- | sys/net/pf_ioctl.c | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/sys/net/if.c b/sys/net/if.c index 4000f40dd35..aa682c969f1 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.279 2013/11/28 10:16:44 mpi Exp $ */ +/* $OpenBSD: if.c,v 1.280 2014/02/04 01:04:03 tedu Exp $ */ /* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */ /* @@ -180,7 +180,7 @@ ifinit() static struct timeout if_slowtim; pool_init(&ifaddr_item_pl, sizeof(struct ifaddr_item), 0, 0, 0, - "ifaddritempl", NULL); + "ifaddritem", NULL); timeout_set(&if_slowtim, if_slowtimo, &if_slowtim); diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c index e887a2d6a8f..f87ea5ced82 100644 --- a/sys/net/pf_ioctl.c +++ b/sys/net/pf_ioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_ioctl.c,v 1.268 2014/01/20 02:57:50 henning Exp $ */ +/* $OpenBSD: pf_ioctl.c,v 1.269 2014/02/04 01:04:03 tedu Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -161,24 +161,24 @@ pfattach(int num) { u_int32_t *timeout = pf_default_rule.timeout; - pool_init(&pf_rule_pl, sizeof(struct pf_rule), 0, 0, 0, "pfrulepl", + pool_init(&pf_rule_pl, sizeof(struct pf_rule), 0, 0, 0, "pfrule", &pool_allocator_nointr); pool_init(&pf_src_tree_pl, sizeof(struct pf_src_node), 0, 0, 0, - "pfsrctrpl", NULL); + "pfsrctr", NULL); pool_init(&pf_sn_item_pl, sizeof(struct pf_sn_item), 0, 0, 0, - "pfsnitempl", NULL); - pool_init(&pf_state_pl, sizeof(struct pf_state), 0, 0, 0, "pfstatepl", + "pfsnitem", NULL); + pool_init(&pf_state_pl, sizeof(struct pf_state), 0, 0, 0, "pfstate", NULL); pool_init(&pf_state_key_pl, sizeof(struct pf_state_key), 0, 0, 0, - "pfstatekeypl", NULL); + "pfstkey", NULL); pool_init(&pf_state_item_pl, sizeof(struct pf_state_item), 0, 0, 0, - "pfstateitempl", NULL); + "pfstitem", NULL); pool_init(&pf_rule_item_pl, sizeof(struct pf_rule_item), 0, 0, 0, - "pfruleitempl", NULL); - pool_init(&pf_altq_pl, sizeof(struct pf_altq), 0, 0, 0, "pfaltqpl", + "pfruleitem", NULL); + pool_init(&pf_altq_pl, sizeof(struct pf_altq), 0, 0, 0, "pfaltq", &pool_allocator_nointr); pool_init(&pf_queue_pl, sizeof(struct pf_queuespec), 0, 0, 0, - "pfqueuepl", NULL); + "pfqueue", NULL); pool_init(&hfsc_class_pl, sizeof(struct hfsc_class), 0, 0, PR_WAITOK, "hfscclass", NULL); pool_init(&hfsc_classq_pl, sizeof(struct hfsc_classq), 0, 0, PR_WAITOK, |