d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

instead of special casing lookups for the 11na/g legacy rate set, just

Browse Source 
install the rates once when creating the com structure
This commit is contained in:
Sam Leffler 2009-02-19 04:33:36 +00:00
parent 17e45e1934
commit 40432d369a
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/net80211/ieee80211.c
View File

@ -185,6 +185,8 @@ ieee80211_chan_init(struct ieee80211com *ic)
DEFAULTRATES(IEEE80211_MODE_TURBO_A, ieee80211_rateset_11a);
DEFAULTRATES(IEEE80211_MODE_TURBO_G, ieee80211_rateset_11g);
DEFAULTRATES(IEEE80211_MODE_STURBO_A, ieee80211_rateset_11a);
DEFAULTRATES(IEEE80211_MODE_11NA, ieee80211_rateset_11a);
DEFAULTRATES(IEEE80211_MODE_11NG, ieee80211_rateset_11g);
/*
* Set auto mode to reset active channel state and any desired channel.
@ -1011,12 +1013,7 @@ ieee80211_get_suprates(struct ieee80211com *ic, const struct ieee80211_channel *
return &ieee80211_rateset_half;
if (IEEE80211_IS_CHAN_QUARTER(c))
return &ieee80211_rateset_quarter;
if (IEEE80211_IS_CHAN_HTA(c))
return &ic->ic_sup_rates[IEEE80211_MODE_11A];
if (IEEE80211_IS_CHAN_HTG(c)) {
/* XXX does this work for basic rates? */
return &ic->ic_sup_rates[IEEE80211_MODE_11G];
}
/* XXX does this work for 11ng basic rates? */
return &ic->ic_sup_rates[ieee80211_chan2mode(c)];
}

3
sys/net80211/ieee80211_ioctl.c
View File

@ -2121,8 +2121,7 @@ ieee80211_ioctl_settxparams(struct ieee80211vap *vap,
continue;
src = &parms.params[i];
dst = &vap->iv_txparms[i];
rs = &ic->ic_sup_rates[i == IEEE80211_MODE_11NA ?
IEEE80211_MODE_11A : IEEE80211_MODE_11G];
rs = &ic->ic_sup_rates[i];
if (src->ucastrate != dst->ucastrate) {
if (!checkmcs(src->ucastrate) &&
!checkrate(rs, src->ucastrate))