[Midnightbsd-cvs] src: if_ndis.c: stop kernel panics when ndis fails to attach and it's

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Jan 20 14:37:49 EST 2009


Log Message:
-----------
stop kernel panics when ndis fails to attach and it's not a wifi device

Modified Files:
--------------
    src/sys/dev/if_ndis:
        if_ndis.c (r1.3 -> r1.4)

-------------- next part --------------
Index: if_ndis.c
===================================================================
RCS file: /home/cvs/src/sys/dev/if_ndis/if_ndis.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -L sys/dev/if_ndis/if_ndis.c -L sys/dev/if_ndis/if_ndis.c -u -r1.3 -r1.4
--- sys/dev/if_ndis/if_ndis.c
+++ sys/dev/if_ndis/if_ndis.c
@@ -966,7 +966,8 @@
 	} else
 		NDIS_UNLOCK(sc);
 
-	taskqueue_drain(sc->ndis_tq, &sc->ndis_scantask);
+	if (sc->ndis_80211)
+		taskqueue_drain(sc->ndis_tq, &sc->ndis_scantask);
 
 	if (sc->ndis_tickitem != NULL)
 		IoFreeWorkItem(sc->ndis_tickitem);
@@ -1025,7 +1026,8 @@
 	if (sc->ndis_iftype == PCIBus)
 		bus_dma_tag_destroy(sc->ndis_parent_tag);
 
-	taskqueue_free(sc->ndis_tq);
+	if (sc->ndis_80211)
+		taskqueue_free(sc->ndis_tq);
 
 	return(0);
 }


More information about the Midnightbsd-cvs mailing list