Module Name: src
Committed By: snj
Date: Sat Jan 13 04:44:29 UTC 2018
Modified Files:
src/sys/dev/ic [netbsd-8]: dwc_gmac.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #456):
sys/dev/ic/dwc_gmac.c: 1.45
Don't KASSERT that we are MPSAFE if ! DWCGMAC_MPSAFE
To generate a diff of this commit:
cvs rdiff -u -r1.40.6.2 -r1.40.6.3 src/sys/dev/ic/dwc_gmac.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/dwc_gmac.c
diff -u src/sys/dev/ic/dwc_gmac.c:1.40.6.2 src/sys/dev/ic/dwc_gmac.c:1.40.6.3
--- src/sys/dev/ic/dwc_gmac.c:1.40.6.2 Tue Jan 2 10:20:32 2018
+++ src/sys/dev/ic/dwc_gmac.c Sat Jan 13 04:44:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_gmac.c,v 1.40.6.2 2018/01/02 10:20:32 snj Exp $ */
+/* $NetBSD: dwc_gmac.c,v 1.40.6.3 2018/01/13 04:44:29 snj Exp $ */
/*-
* Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.40.6.2 2018/01/02 10:20:32 snj Exp $");
+__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.40.6.3 2018/01/13 04:44:29 snj Exp $");
/* #define DWC_GMAC_DEBUG 1 */
@@ -838,7 +838,9 @@ static void
dwc_gmac_start(struct ifnet *ifp)
{
struct dwc_gmac_softc *sc = ifp->if_softc;
+#ifdef DWCGMAC_MPSAFE
KASSERT(if_is_mpsafe(ifp));
+#endif
mutex_enter(sc->sc_lock);
if (!sc->sc_stopping) {
