d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In bwi_newstate, only zero the bssid when we stop a STA. And only

Browse Source 
when we've not stopped the card.  It hangs the system when we touch
the CSR after bwistop.

This fixes the hanging on kldunload.
This commit is contained in:
imp 2009-06-02 16:48:10 +00:00
parent 0010c8697b
commit 2f4849a20f
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/dev/bwi/if_bwi.c
View File

@ -1771,10 +1771,12 @@ static int
bwi_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) bwi_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
{ {
struct bwi_vap *bvp = BWI_VAP(vap); struct bwi_vap *bvp = BWI_VAP(vap);
struct ifnet *ifp = vap->iv_ic->ic_ifp; struct ieee80211com *ic= vap->iv_ic;
struct ifnet *ifp = ic->ic_ifp;
enum ieee80211_state ostate = vap->iv_state;
struct bwi_softc *sc = ifp->if_softc; struct bwi_softc *sc = ifp->if_softc;
struct bwi_mac *mac; struct bwi_mac *mac;
struct ieee80211_node *ni; struct ieee80211_node *ni = vap->iv_bss;
int error; int error;
BWI_LOCK(sc); BWI_LOCK(sc);
@ -1790,11 +1792,25 @@ bwi_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
if (error != 0) if (error != 0)
goto back; goto back;
/*
* Clear the BSSID when we stop a STA
*/
if (vap->iv_opmode == IEEE80211_M_STA) {
if (ostate == IEEE80211_S_RUN && nstate != IEEE80211_S_RUN) {
/*
* Clear out the BSSID. If we reassociate to
* the same AP, this will reinialize things
* correctly...
*/
if (ic->ic_opmode == IEEE80211_M_STA &&
!(sc->sc_flags & BWI_F_STOP))
bwi_set_bssid(sc, bwi_zero_addr);
}
}
if (vap->iv_opmode == IEEE80211_M_MONITOR) { if (vap->iv_opmode == IEEE80211_M_MONITOR) {
/* Nothing to do */ /* Nothing to do */
} else if (nstate == IEEE80211_S_RUN) { } else if (nstate == IEEE80211_S_RUN) {
ni = vap->iv_bss;
bwi_set_bssid(sc, vap->iv_bss->ni_bssid); bwi_set_bssid(sc, vap->iv_bss->ni_bssid);
KASSERT(sc->sc_cur_regwin->rw_type == BWI_REGWIN_T_MAC, KASSERT(sc->sc_cur_regwin->rw_type == BWI_REGWIN_T_MAC,
@ -1814,8 +1830,6 @@ bwi_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
} }
callout_reset(&sc->sc_calib_ch, hz, bwi_calibrate, sc); callout_reset(&sc->sc_calib_ch, hz, bwi_calibrate, sc);
} else {
bwi_set_bssid(sc, bwi_zero_addr);
} }
back: back:
BWI_UNLOCK(sc); BWI_UNLOCK(sc);