diff options
| author | weongyo <weongyo@FreeBSD.org> | 2010-06-29 21:52:40 +0000 |
|---|---|---|
| committer | weongyo <weongyo@FreeBSD.org> | 2010-06-29 21:52:40 +0000 |
| commit | 031846c086e4509988d5bb5bea7699703882ffa4 (patch) | |
| tree | 9034b6056f45ab62fc473198b4295942415b1b06 /sys/dev/bwi | |
| parent | e7262f9721e647dd2de39abea09359e78a5c15a3 (diff) | |
| download | FreeBSD-src-031846c086e4509988d5bb5bea7699703882ffa4.zip FreeBSD-src-031846c086e4509988d5bb5bea7699703882ffa4.tar.gz | |
Fixes NULL pointer reference that it's occurred when the state is
changed to RUN because ic->ic_newassoc isn't set anywhere now. In the
previous bwi_newassoc() is used to initialize AMRR rate routines.
Tested by: Warren Block <wblock at wonkity.com>
MFC after: 3 days
Diffstat (limited to 'sys/dev/bwi')
| -rw-r--r-- | sys/dev/bwi/if_bwi.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sys/dev/bwi/if_bwi.c b/sys/dev/bwi/if_bwi.c index 724778d..91145e4 100644 --- a/sys/dev/bwi/if_bwi.c +++ b/sys/dev/bwi/if_bwi.c @@ -1774,7 +1774,6 @@ bwi_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) enum ieee80211_state ostate = vap->iv_state; struct bwi_softc *sc = ifp->if_softc; struct bwi_mac *mac; - struct ieee80211_node *ni = vap->iv_bss; int error; BWI_LOCK(sc); @@ -1822,10 +1821,6 @@ bwi_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) #else sc->sc_txpwrcb_type = BWI_TXPWR_CALIB; #endif - if (vap->iv_opmode == IEEE80211_M_STA) { - /* fake a join to init the tx rate */ - ic->ic_newassoc(ni, 1); - } callout_reset(&sc->sc_calib_ch, hz, bwi_calibrate, sc); } |
