Date: Thu, 10 Apr 2008 23:22:15 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 139766 for review Message-ID: <200804102322.m3ANMFcE052503@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=139766 Change 139766 by sam@sam_ebb on 2008/04/10 23:22:11 catch up w/ ioctl changes; can't reference ni_chan except in RUN state Affected files ... .. //depot/projects/vap/sys/dev/mwl/if_mwl.c#5 edit Differences ... ==== //depot/projects/vap/sys/dev/mwl/if_mwl.c#5 (text+ko) ==== @@ -1078,6 +1078,8 @@ enum ieee80211_phymode mode; MWL_HAL_TXRATE rates; + KASSERT(vap->iv_state == IEEE80211_S_RUN, ("state %d", vap->iv_state)); + mode = ieee80211_chan2mode(ni->ni_chan); /* * Use legacy rates when operating a mixed HT+non-HT bss. @@ -1116,6 +1118,8 @@ enum ieee80211_phymode mode; uint8_t rate; + KASSERT(vap->iv_state == IEEE80211_S_RUN, ("state %d", vap->iv_state)); + mode = ieee80211_chan2mode(ni->ni_chan); /* * Use legacy rates when operating a mixed HT+non-HT bss. @@ -1298,7 +1302,8 @@ struct mwl_hal_vap *hvap = MWL_VAP(vap)->mv_hvap; struct ieee80211com *ic = vap->iv_ic; - mwl_setrates(vap); + if (state == IEEE80211_S_RUN) + mwl_setrates(vap); /* XXX off by 1? */ mwl_hal_setrtsthreshold(hvap, vap->iv_rtsthreshold); /* XXX auto? 20/40 split? */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804102322.m3ANMFcE052503>