From 031846c086e4509988d5bb5bea7699703882ffa4 Mon Sep 17 00:00:00 2001 From: weongyo Date: Tue, 29 Jun 2010 21:52:40 +0000 Subject: 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 MFC after: 3 days --- sys/dev/bwi/if_bwi.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'sys/dev/bwi') 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); } -- cgit v1.1