iwn - Convert to use the new wlan layer's global token.

diff --git a/sys/dev/netif/iwn/if_iwn.c b/sys/dev/netif/iwn/if_iwn.c
index 8199142..1a6f826 100644 (file)
--- a/sys/dev/netif/iwn/if_iwn.c
+++ b/sys/dev/netif/iwn/if_iwn.c
@@ -3532,7 +3532,7 @@ iwn_cmd(struct iwn_softc *sc, int code, const void *buf, int size, int async)
        ring->cur = (ring->cur + 1) % IWN_TX_RING_COUNT;
        IWN_WRITE(sc, IWN_HBUS_TARG_WRPTR, ring->qid << 8 | ring->cur);
 
-       return async ? 0 : lksleep(desc, &sc->sc_lock, 0, "iwncmd", hz);
+       return async ? 0 : tsleep(desc, 0, "iwncmd", hz);
 }
 
 static int
@@ -5256,7 +5256,7 @@ iwn5000_query_calibration(struct iwn_softc *sc)
 
        /* Wait at most two seconds for calibration to complete. */
        if (!(sc->sc_flags & IWN_FLAG_CALIB_DONE))
-               error = lksleep(sc, &sc->sc_lock, 0, "iwninit", 2 * hz);
+               error = tsleep(sc, 0, "iwninit", 2 * hz);
        return error;
 }
 
@@ -5556,7 +5556,7 @@ iwn4965_load_firmware(struct iwn_softc *sc)
        IWN_WRITE(sc, IWN_RESET, 0);
 
        /* Wait at most one second for first alive notification. */
-       error = lksleep(sc, &sc->sc_lock, 0, "iwninit", hz);
+       error = tsleep(sc, 0, "iwninit", hz);
        if (error) {
                device_printf(sc->sc_dev,
                    "%s: timeout waiting for adapter to initialize, error %d\n",
@@ -5626,7 +5626,7 @@ iwn5000_load_firmware_section(struct iwn_softc *sc, uint32_t dst,
        iwn_nic_unlock(sc);
 
        /* Wait at most five seconds for FH DMA transfer to complete. */
-       return lksleep(sc, &sc->sc_lock, 0, "iwninit", hz);
+       return tsleep(sc, 0, "iwninit", hz);
 }
 
 static int
@@ -6050,7 +6050,7 @@ iwn_hw_init(struct iwn_softc *sc)
                return error;
        }
        /* Wait at most one second for firmware alive notification. */
-       error = lksleep(sc, &sc->sc_lock, 0, "iwninit", hz);
+       error = tsleep(sc, 0, "iwninit", hz);
        if (error != 0) {
                device_printf(sc->sc_dev,
                    "%s: timeout waiting for adapter to initialize, error %d\n",

diff --git a/sys/dev/netif/iwn/if_iwnvar.h b/sys/dev/netif/iwn/if_iwnvar.h
index b8908f3..d224e51 100644 (file)
--- a/sys/dev/netif/iwn/if_iwnvar.h
+++ b/sys/dev/netif/iwn/if_iwnvar.h
@@ -330,7 +330,6 @@ struct iwn_softc {
 #define IWN_LOCK_ASSERT(_sc)           ASSERT_SERIALIZED((_sc)->sc_ifp->if_serializer)
 #define IWN_UNLOCK(_sc)                        lwkt_serialize_exit((_sc)->sc_ifp->if_serializer)
 #define IWN_LOCK_DESTROY(_sc)
-#endif
 
 #define IWN_LOCK_INIT(_sc) \
        lockinit(&(_sc)->sc_lock, \
@@ -340,3 +339,10 @@ struct iwn_softc {
 #define IWN_LOCK_ASSERT(_sc)           KKASSERT(lockstatus(&(sc)->sc_lock, curthread)  != 0)
 #define IWN_UNLOCK(_sc)                        lockmgr(&(_sc)->sc_lock, LK_RELEASE)
 #define IWN_LOCK_DESTROY(_sc)          lockuninit(&(_sc)->sc_lock)
+#endif
+
+#define IWN_LOCK_INIT(_sc)
+#define IWN_LOCK(_sc) lwkt_gettoken(&wlan_token)
+#define IWN_UNLOCK(_sc) lwkt_reltoken(&wlan_token)
+#define IWN_LOCK_DESTROY(_sc)
+#define IWN_LOCK_ASSERT(_sc) ASSERT_LWKT_TOKEN_HELD(&wlan_token)