PERFORCE change 180604 for review

[Hans Petter Selasky]

http://p4web.freebsd.org/@@180604?ac=10

Change 180604 by hselasky at hselasky_laptop001 on 2010/07/07 19:10:17

	USB WLAN:
		- possible fix for panic issues
		- patch by: HPS @

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#28 edit
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_run.c#13 edit
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_uath.c#21 edit
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_upgt.c#21 edit
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#22 edit
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_urtw.c#15 edit
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#28 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#28 (text+ko) ====

@@ -708,6 +708,10 @@
 		ieee80211_state_name[nstate]);
 
 	IEEE80211_UNLOCK(ic);
+
+	/* XXX temporary workaround for race in IEEE802.11 layer */
+	usb_pause_mtx(NULL, hz / 16);
+
 	RUM_LOCK(sc);
 	usb_callout_stop(&rvp->ratectl_ch);
 

==== //depot/projects/usb/src/sys/dev/usb/wlan/if_run.c#13 (text+ko) ====


==== //depot/projects/usb/src/sys/dev/usb/wlan/if_uath.c#21 (text+ko) ====

@@ -2075,6 +2075,10 @@
 	    ieee80211_state_name[nstate]);
 
 	IEEE80211_UNLOCK(ic);
+
+	/* XXX temporary workaround for race in IEEE802.11 layer */
+	usb_pause_mtx(NULL, hz / 16);
+
 	UATH_LOCK(sc);
 	callout_stop(&sc->stat_ch);
 	callout_stop(&sc->watchdog_ch);

==== //depot/projects/usb/src/sys/dev/usb/wlan/if_upgt.c#21 (text+ko) ====

@@ -1055,6 +1055,10 @@
 	sc->sc_state = nstate;
 
 	IEEE80211_UNLOCK(ic);
+
+	/* XXX temporary workaround for race in IEEE802.11 layer */
+	usb_pause_mtx(NULL, hz / 16);
+
 	UPGT_LOCK(sc);
 	callout_stop(&sc->sc_led_ch);
 	callout_stop(&sc->sc_watchdog_ch);

==== //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#22 (text+ko) ====

@@ -694,6 +694,10 @@
 		ieee80211_state_name[nstate]);
 
 	IEEE80211_UNLOCK(ic);
+
+	/* XXX temporary workaround for race in IEEE802.11 layer */
+	usb_pause_mtx(NULL, hz / 16);
+
 	RAL_LOCK(sc);
 	usb_callout_stop(&uvp->ratectl_ch);
 

==== //depot/projects/usb/src/sys/dev/usb/wlan/if_urtw.c#15 (text+ko) ====

@@ -1843,6 +1843,10 @@
 	sc->sc_state = nstate;
 
 	IEEE80211_UNLOCK(ic);
+
+	/* XXX temporary workaround for race in IEEE802.11 layer */
+	usb_pause_mtx(NULL, hz / 16);
+
 	URTW_LOCK(sc);
 	usb_callout_stop(&sc->sc_led_ch);
 	callout_stop(&sc->sc_watchdog_ch);

==== //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#28 (text+ko) ====

@@ -579,6 +579,10 @@
 	    ieee80211_state_name[nstate]);
 
 	IEEE80211_UNLOCK(ic);
+
+	/* XXX temporary workaround for race in IEEE802.11 layer */
+	usb_pause_mtx(NULL, hz / 16);
+
 	ZYD_LOCK(sc);
 	switch (nstate) {
 	case IEEE80211_S_AUTH: