diff options
| author | dg <dg@FreeBSD.org> | 1997-01-15 20:46:02 +0000 |
|---|---|---|
| committer | dg <dg@FreeBSD.org> | 1997-01-15 20:46:02 +0000 |
| commit | 78afd808d565ede1deb869a7d1d7885b10db6033 (patch) | |
| tree | 80b222a8d246fee7cd57a6c4ef76bc307b774810 /sys/kern/uipc_mbuf.c | |
| parent | 3f900d53fcdc1fa8bc234e63452b1b782b255ceb (diff) | |
| download | FreeBSD-src-78afd808d565ede1deb869a7d1d7885b10db6033.zip FreeBSD-src-78afd808d565ede1deb869a7d1d7885b10db6033.tar.gz | |
Fix bug related to map entry allocations where a sleep might be attempted
when allocating memory for network buffers at interrupt time. This is due
to inadequate checking for the new mcl_map. Fixed by merging mb_map and
mcl_map into a single mb_map.
Reviewed by: wollman
Diffstat (limited to 'sys/kern/uipc_mbuf.c')
| -rw-r--r-- | sys/kern/uipc_mbuf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index 9c93c4a..3f99385 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -150,11 +150,11 @@ m_clalloc(ncl, nowait) * to get any more (nothing is ever freed back to the * map). */ - if (mcl_map_full) + if (mb_map_full) return (0); npg = ncl; - p = (caddr_t)kmem_malloc(mcl_map, ctob(npg), + p = (caddr_t)kmem_malloc(mb_map, ctob(npg), nowait ? M_NOWAIT : M_WAITOK); /* * Either the map is now full, or this is nowait and there |
