diff options
| author | Ryan Thomas McBride <mcbride@cvs.openbsd.org> | 2008-10-08 06:24:51 +0000 |
|---|---|---|
| committer | Ryan Thomas McBride <mcbride@cvs.openbsd.org> | 2008-10-08 06:24:51 +0000 |
| commit | 1df4693c3e408b03906b0eae0be04d673b60cc0a (patch) | |
| tree | b7a53bcc35b6d149baf6f60a3b085e6822c49422 | |
| parent | 55b75535a41a62ca8340443177cfad4e5d0cfccb (diff) | |
Get rid of the second table entry pool (pfr_kentry_pl2); we're already
using the default interrupt handler for both, so there's no need to keep
table entries created in interrupt context separate.
ok henning art
| -rw-r--r-- | sys/net/pf_table.c | 13 | ||||
| -rw-r--r-- | sys/net/pfvar.h | 3 |
2 files changed, 4 insertions, 12 deletions
diff --git a/sys/net/pf_table.c b/sys/net/pf_table.c index c8ac76fc53d..4d1e0fd9939 100644 --- a/sys/net/pf_table.c +++ b/sys/net/pf_table.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_table.c,v 1.78 2008/06/14 03:50:14 art Exp $ */ +/* $OpenBSD: pf_table.c,v 1.79 2008/10/08 06:24:50 mcbride Exp $ */ /* * Copyright (c) 2002 Cedric Berger @@ -126,7 +126,6 @@ struct pfr_walktree { struct pool pfr_ktable_pl; struct pool pfr_kentry_pl; -struct pool pfr_kentry_pl2; struct pool pfr_kcounters_pl; struct sockaddr_in pfr_sin; struct sockaddr_in6 pfr_sin6; @@ -194,8 +193,6 @@ pfr_initialize(void) "pfrktable", NULL); pool_init(&pfr_kentry_pl, sizeof(struct pfr_kentry), 0, 0, 0, "pfrkentry", NULL); - pool_init(&pfr_kentry_pl2, sizeof(struct pfr_kentry), 0, 0, 0, - "pfrkentry2", NULL); pool_init(&pfr_kcounters_pl, sizeof(struct pfr_kcounters), 0, 0, 0, "pfrkcounters", NULL); @@ -811,7 +808,7 @@ pfr_create_kentry(struct pfr_addr *ad, int intr) struct pfr_kentry *ke; if (intr) - ke = pool_get(&pfr_kentry_pl2, PR_NOWAIT | PR_ZERO); + ke = pool_get(&pfr_kentry_pl, PR_NOWAIT | PR_ZERO); else ke = pool_get(&pfr_kentry_pl, PR_WAITOK|PR_ZERO|PR_LIMITFAIL); if (ke == NULL) @@ -824,7 +821,6 @@ pfr_create_kentry(struct pfr_addr *ad, int intr) ke->pfrke_af = ad->pfra_af; ke->pfrke_net = ad->pfra_net; ke->pfrke_not = ad->pfra_not; - ke->pfrke_intrpool = intr; return (ke); } @@ -844,10 +840,7 @@ pfr_destroy_kentry(struct pfr_kentry *ke) { if (ke->pfrke_counters) pool_put(&pfr_kcounters_pl, ke->pfrke_counters); - if (ke->pfrke_intrpool) - pool_put(&pfr_kentry_pl2, ke); - else - pool_put(&pfr_kentry_pl, ke); + pool_put(&pfr_kentry_pl, ke); } void diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 2fb1d99b0be..e8ed133845a 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfvar.h,v 1.279 2008/09/22 10:22:19 mpf Exp $ */ +/* $OpenBSD: pfvar.h,v 1.280 2008/10/08 06:24:50 mcbride Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1005,7 +1005,6 @@ struct pfr_kentry { u_int8_t pfrke_net; u_int8_t pfrke_not; u_int8_t pfrke_mark; - u_int8_t pfrke_intrpool; }; #define pfrke_counters u.pfrke_counters #define pfrke_route u.pfrke_route |