PERFORCE change 136956 for review

[Andrew Thompson]

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

Change 136956 by thompsa at thompsa_peeps on 2008/03/05 23:06:28

	- Add a missing break on IEEE80211_S_AUTH which made things interesting
	- Make sure to set the callout in wpi_run, we dont reenter wpi_newstate

Affected files ...

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

Differences ...

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

@@ -1263,6 +1263,7 @@
 		if (ic->ic_state != IEEE80211_S_AUTH)
 			return wpi_queue_cmd(sc, WPI_AUTH, arg,
 			    WPI_QUEUE_NORMAL);
+		break;
 
 	case IEEE80211_S_RUN:
 		if (ic->ic_opmode == IEEE80211_M_MONITOR) {
@@ -1274,9 +1275,6 @@
 			/* set the association id first */
 			return wpi_queue_cmd(sc, WPI_RUN, arg,
 			    WPI_QUEUE_NORMAL);
-
-		/* start automatic rate control timer */
-		callout_reset(&sc->calib_to, hz/2, wpi_calib_timeout, sc);
 		break;
 
 	default:
@@ -2507,6 +2505,9 @@
 	/* link LED always on while associated */
 	wpi_set_led(sc, WPI_LED_LINK, 0, 1);
 
+	/* start automatic rate control timer */
+	callout_reset(&sc->calib_to, hz/2, wpi_calib_timeout, sc);
+
 	return (error);
 }