Author: weongyo
Date: Thu Jul 8 19:36:38 2010
New Revision: 209821
URL: http://svn.freebsd.org/changeset/base/209821
Log:
MFC r209597:
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>
Modified:
stable/8/sys/dev/bwi/if_bwi.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/dev/bwi/if_bwi.c
==============================================================================
--- stable/8/sys/dev/bwi/if_bwi.c Thu Jul 8 19:22:52 2010
(r209820)
+++ stable/8/sys/dev/bwi/if_bwi.c Thu Jul 8 19:36:38 2010
(r209821)
@@ -1769,7 +1769,6 @@ bwi_newstate(struct ieee80211vap *vap, e
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);
@@ -1817,10 +1816,6 @@ bwi_newstate(struct ieee80211vap *vap, e
#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);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
