PERFORCE change 137041 for review

[Andrew Thompson]

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

Change 137041 by thompsa at thompsa_peeps on 2008/03/07 01:00:26

	Gah, save scheduling the taskqueue.

Affected files ...

.. //depot/projects/wifi/sys/dev/wpi/if_wpi.c#21 edit

Differences ...

==== //depot/projects/wifi/sys/dev/wpi/if_wpi.c#21 (text+ko) ====

@@ -3573,7 +3573,12 @@
 	struct ifnet *ifp = ic->ic_ifp;
 	struct wpi_softc *sc = ifp->if_softc;
 
-	wpi_queue_cmd(sc, WPI_SET_CHAN, 0, WPI_QUEUE_NORMAL);
+	/*
+	 * Only need to set the channel in Monitor mode. AP scanning and auth
+	 * are already taken care of by their respective firmware commands.
+	 */
+	if (ic->ic_opmode == IEEE80211_M_MONITOR)
+		wpi_queue_cmd(sc, WPI_SET_CHAN, 0, WPI_QUEUE_NORMAL);
 }
 
 /**
@@ -3667,17 +3672,10 @@
 		break;
 
 	case WPI_SET_CHAN:
-		/*
-		 * Only need to set the channel in Monitor mode. AP scanning
-		 * and auth are already taken care of by their respective
-		 * firmware commands.
-		 */
-		if (ic->ic_opmode == IEEE80211_M_MONITOR) {
-			error = wpi_config(sc);
-			if (error != 0)
-				device_printf(sc->sc_dev,
-				    "error %d settting channel\n", error);
-		}
+		error = wpi_config(sc);
+		if (error != 0)
+			device_printf(sc->sc_dev,
+			    "error %d settting channel\n", error);
 		break;
 
 	case WPI_AUTH: