Module Name: src Committed By: snj Date: Sat Aug 12 03:48:49 UTC 2017
Modified Files: src/sys/dev/ic [netbsd-7]: bwi.c Log Message: Pull up following revision(s) (requested by mrg in ticket #1474): sys/dev/ic/bwi.c: revision 1.32 Check for M_EXT in m->m_flags, whether m is NULL, after MCLGET. >From Ilja Van Sprundel. To generate a diff of this commit: cvs rdiff -u -r1.24.4.1 -r1.24.4.2 src/sys/dev/ic/bwi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/ic/bwi.c diff -u src/sys/dev/ic/bwi.c:1.24.4.1 src/sys/dev/ic/bwi.c:1.24.4.2 --- src/sys/dev/ic/bwi.c:1.24.4.1 Tue Apr 21 04:55:15 2015 +++ src/sys/dev/ic/bwi.c Sat Aug 12 03:48:49 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: bwi.c,v 1.24.4.1 2015/04/21 04:55:15 snj Exp $ */ +/* $NetBSD: bwi.c,v 1.24.4.2 2017/08/12 03:48:49 snj Exp $ */ /* $OpenBSD: bwi.c,v 1.74 2008/02/25 21:13:30 mglocker Exp $ */ /* @@ -48,7 +48,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bwi.c,v 1.24.4.1 2015/04/21 04:55:15 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bwi.c,v 1.24.4.2 2017/08/12 03:48:49 snj Exp $"); #include <sys/param.h> #include <sys/callout.h> @@ -8292,7 +8292,7 @@ bwi_newbuf(struct bwi_softc *sc, int buf if (m == NULL) return (ENOBUFS); MCLGET(m, init ? M_WAITOK : M_DONTWAIT); - if (m == NULL) { + if ((m->m_flags & M_EXT) == 0) { error = ENOBUFS; /*