PERFORCE change 76647 for review
Sam Leffler
sam at FreeBSD.org
Fri May 6 20:39:15 PDT 2005
http://perforce.freebsd.org/chv.cgi?CH=76647
Change 76647 by sam at sam_ebb on 2005/05/07 03:38:53
remove more remnants of ic_curmode
Affected files ...
.. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#7 edit
.. //depot/projects/vap/sys/net80211/ieee80211_output.c#8 edit
Differences ...
==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#7 (text+ko) ====
@@ -297,12 +297,13 @@
wreq.wi_len = IEEE80211_ADDR_LEN / 2;
break;
case WI_RID_TX_RATE:
- if (vap->iv_fixed_rate == -1)
+ if (vap->iv_fixed_rate != -1 &&
+ ic->ic_bsschan != IEEE80211_CHAN_ANYC) {
+ i = ieee80211_chan2mode(ic->ic_bsschan);
+ j = ic->ic_sup_rates[i].rs_rates[vap->iv_fixed_rate] & IEEE80211_RATE_VAL;
+ wreq.wi_val[0] = htole16(j / 2);
+ } else
wreq.wi_val[0] = 0; /* auto */
- else
- wreq.wi_val[0] = htole16(
- (ic->ic_sup_rates[ic->ic_curmode].rs_rates[vap->iv_fixed_rate] &
- IEEE80211_RATE_VAL) / 2);
wreq.wi_len = 1;
break;
case WI_RID_CUR_TX_RATE:
@@ -2209,7 +2210,8 @@
return EINVAL;
ic->ic_protmode = ireq->i_val;
/* NB: if not operating in 11g this can wait */
- if (ic->ic_curmode == IEEE80211_MODE_11G)
+ if (ic->ic_bsschan != IEEE80211_CHAN_ANYC &&
+ IEEE80211_IS_CHAN_ANYG(ic->ic_bsschan))
error = IS_UP(vap) ? ic->ic_reset(ifp) : 0;
break;
case IEEE80211_IOC_TXPOWER:
==== //depot/projects/vap/sys/net80211/ieee80211_output.c#8 (text+ko) ====
@@ -2041,7 +2041,7 @@
}
if (vap->iv_flags & IEEE80211_F_WPA)
frm = ieee80211_add_wpa(frm, vap);
- if (ic->ic_curmode == IEEE80211_MODE_11G)
+ if (IEEE80211_IS_CHAN_ANYG(ic->ic_bsschan))
frm = ieee80211_add_erp(frm, ic);
efrm = ieee80211_add_xrates(frm, rs);
bo->bo_trailer_len = efrm - bo->bo_trailer;
More information about the p4-projects
mailing list