From owner-p4-projects@FreeBSD.ORG Wed Jul 7 19:10:28 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11FB91065675; Wed, 7 Jul 2010 19:10:28 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CB0E81065673 for ; Wed, 7 Jul 2010 19:10:27 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9EA7B8FC18 for ; Wed, 7 Jul 2010 19:10:27 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o67JAR5X037664 for ; Wed, 7 Jul 2010 19:10:27 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o67JARBD037661 for perforce@freebsd.org; Wed, 7 Jul 2010 19:10:27 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 7 Jul 2010 19:10:27 GMT Message-Id: <201007071910.o67JARBD037661@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180604 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Jul 2010 19:10:28 -0000 http://p4web.freebsd.org/@@180604?ac=10 Change 180604 by hselasky@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: