diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2015-09-06 12:59:21 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2015-09-06 12:59:21 +0000 |
| commit | e17ec89aac69a4ddcea0384ff7fe8d24ad7d806a (patch) | |
| tree | 1b49a6c098546f8d70b27a625ac8ca4b27f9f62c | |
| parent | 4e989ba41a995767f30059a81a35ba50a6b88256 (diff) | |
The pppx_if_pl pool will never be used in interrupt context, so pass the
PR_WAITOK flag to pool_init and pass NULL as the pool allocator.
ok dlg@
| -rw-r--r-- | sys/net/if_pppx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/net/if_pppx.c b/sys/net/if_pppx.c index 525cd705485..d88e92f5008 100644 --- a/sys/net/if_pppx.c +++ b/sys/net/if_pppx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pppx.c,v 1.42 2015/07/18 15:51:16 mpi Exp $ */ +/* $OpenBSD: if_pppx.c,v 1.43 2015/09/06 12:59:20 kettenis Exp $ */ /* * Copyright (c) 2010 Claudio Jeker <claudio@openbsd.org> @@ -247,8 +247,8 @@ pppxopen(dev_t dev, int flags, int mode, struct proc *p) if (LIST_EMPTY(&pppx_devs) && pppx_if_pl == NULL) { pppx_if_pl = malloc(sizeof(*pppx_if_pl), M_DEVBUF, M_WAITOK); - pool_init(pppx_if_pl, sizeof(struct pppx_if), 0, 0, 0, - "pppxif", &pool_allocator_nointr); + pool_init(pppx_if_pl, sizeof(struct pppx_if), 0, 0, PR_WAITOK, + "pppxif", NULL); } pxd = malloc(sizeof(*pxd), M_DEVBUF, M_WAITOK | M_ZERO); |