PERFORCE change 145671 for review

[Weongyo Jeong]

http://perforce.freebsd.org/chv.cgi?CH=145671

Change 145671 by weongyo at weongyo_ws on 2008/07/23 05:20:38

	rename NDISSPIN_... to NDISMTX_... due to the change of locking
	mechanism from NDIS-specific spinlock to mtx.

Affected files ...

.. //depot/projects/ndisusb/sys/dev/if_ndis/if_ndis.c#7 edit
.. //depot/projects/ndisusb/sys/dev/if_ndis/if_ndisvar.h#5 edit

Differences ...

==== //depot/projects/ndisusb/sys/dev/if_ndis/if_ndis.c#7 (text+ko) ====

@@ -1552,7 +1552,7 @@
 	ndis_free_packet(packet);
 	m_freem(m);
 
-	NDISSPIN_LOCK(sc);
+	NDISMTX_LOCK(sc);
 	sc->ndis_txarray[idx] = NULL;
 	sc->ndis_txpending++;
 
@@ -1564,7 +1564,7 @@
 	sc->ndis_tx_timer = 0;
 	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 
-	NDISSPIN_UNLOCK(sc);
+	NDISMTX_UNLOCK(sc);
 
 	IoQueueWorkItem(sc->ndis_startitem,
 	    (io_workitem_func)ndis_starttask_wrap,
@@ -1589,9 +1589,9 @@
 
 	/* Event list is all full up, drop this one. */
 
-	NDISSPIN_LOCK(sc);
+	NDISMTX_LOCK(sc);
 	if (sc->ndis_evt[sc->ndis_evtpidx].ne_sts) {
-		NDISSPIN_UNLOCK(sc);
+		NDISMTX_UNLOCK(sc);
 		return;
 	}
 
@@ -1601,7 +1601,7 @@
 		sc->ndis_evt[sc->ndis_evtpidx].ne_buf = malloc(slen,
 		    M_TEMP, M_NOWAIT);
 		if (sc->ndis_evt[sc->ndis_evtpidx].ne_buf == NULL) {
-			NDISSPIN_UNLOCK(sc);
+			NDISMTX_UNLOCK(sc);
 			return;
 		}
 		bcopy((char *)sbuf,
@@ -1610,7 +1610,7 @@
 	sc->ndis_evt[sc->ndis_evtpidx].ne_sts = status;
 	sc->ndis_evt[sc->ndis_evtpidx].ne_len = slen;
 	NDIS_EVTINC(sc->ndis_evtpidx);
-	NDISSPIN_UNLOCK(sc);
+	NDISMTX_UNLOCK(sc);
 
 	return;
 }

==== //depot/projects/ndisusb/sys/dev/if_ndis/if_ndisvar.h#5 (text+ko) ====

@@ -206,17 +206,17 @@
 #define NDISUSB_STATUS_DETACH	0x1
 };
 
-#define NDISSPIN_LOCK(_sc)	mtx_lock(&(_sc)->ndis_mtx)
-#define NDISSPIN_UNLOCK(_sc)	mtx_unlock(&(_sc)->ndis_mtx)
+#define NDISMTX_LOCK(_sc)	mtx_lock(&(_sc)->ndis_mtx)
+#define NDISMTX_UNLOCK(_sc)	mtx_unlock(&(_sc)->ndis_mtx)
 #define NDISUSB_LOCK(_sc)	mtx_lock(&Giant)
 #define NDISUSB_UNLOCK(_sc)	mtx_unlock(&Giant)
 #define NDIS_LOCK(_sc) do {						\
 	if ((_sc)->ndis_iftype == PNPBus)				\
 		NDISUSB_LOCK(_sc);					\
-	NDISSPIN_LOCK(_sc);						\
+	NDISMTX_LOCK(_sc);						\
 } while (0)
 #define NDIS_UNLOCK(_sc) do {						\
 	if ((_sc)->ndis_iftype == PNPBus)				\
 		NDISUSB_UNLOCK(_sc);					\
-	NDISSPIN_UNLOCK(_sc);						\
+	NDISMTX_UNLOCK(_sc);						\
 } while (0)