From: Aggelos Economopoulos <aoiko@cc.ece.ntua.gr>
Date: Fri, 10 Jul 2009 10:02:31 +0000 (+0300)
Subject: mxge: avoid entering if->if_serializer before it's initialized
X-Git-Tag: v2.3.2~4^2~9
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/02273c775f1e5dacdcc3f12571a381524ff6e4fc

mxge: avoid entering if->if_serializer before it's initialized
---

diff --git a/sys/dev/netif/mxge/if_mxge.c b/sys/dev/netif/mxge/if_mxge.c
index 8945ee6425..82abc7a737 100644
--- a/sys/dev/netif/mxge/if_mxge.c
+++ b/sys/dev/netif/mxge/if_mxge.c
@@ -867,7 +867,12 @@ mxge_send_cmd(mxge_softc_t *sc, uint32_t cmd, mxge_cmd_t *data)
 	buf->response_addr.low = htobe32(dma_low);
 	buf->response_addr.high = htobe32(dma_high);
 
-	lwkt_serialize_enter(sc->ifp->if_serializer);
+	/*
+	 * We may be called during attach, before if_serializer is available.
+	 * This is not a fast path, just check for NULL
+	 */
+	if (sc->ifp->if_serializer)
+		lwkt_serialize_enter(sc->ifp->if_serializer);
 
 	response->result = 0xffffffff;
 	wmb();
@@ -911,7 +916,8 @@ mxge_send_cmd(mxge_softc_t *sc, uint32_t cmd, mxge_cmd_t *data)
 		device_printf(sc->dev, "mxge: command %d timed out"
 			      "result = %d\n",
 			      cmd, be32toh(response->result));
-	lwkt_serialize_exit(sc->ifp->if_serializer);
+	if (sc->ifp->if_serializer)
+		lwkt_serialize_exit(sc->ifp->if_serializer);
 	return err;
 }