diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2015-09-04 21:43:11 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2015-09-04 21:43:11 +0000 |
| commit | 32710040051d84aa163e8967735a0285e790107e (patch) | |
| tree | 58f130edba2d5ca02ed34b4232cfe7dacd5f88f4 | |
| parent | 4a9d78566326d7b1099587c4898c0642c330088e (diff) | |
The bnx_tx_pool gets used from interrupt context, so drop the explicit
backend allocoter here without passing PR_WAITOK to pool_init(9).
ok mikeb@
| -rw-r--r-- | sys/dev/pci/if_bnx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pci/if_bnx.c b/sys/dev/pci/if_bnx.c index ec17fc86769..ee48066ff72 100644 --- a/sys/dev/pci/if_bnx.c +++ b/sys/dev/pci/if_bnx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bnx.c,v 1.112 2015/07/24 01:19:18 dlg Exp $ */ +/* $OpenBSD: if_bnx.c,v 1.113 2015/09/04 21:43:10 kettenis Exp $ */ /*- * Copyright (c) 2006 Broadcom Corporation @@ -4701,7 +4701,7 @@ bnx_init(void *xsc) bnx_tx_pool = malloc(sizeof(*bnx_tx_pool), M_DEVBUF, M_WAITOK); if (bnx_tx_pool != NULL) { pool_init(bnx_tx_pool, sizeof(struct bnx_pkt), - 0, 0, 0, "bnxpkts", &pool_allocator_nointr); + 0, 0, 0, "bnxpkts", NULL); } else txpl = 0; } |