diff options
| author | adrian <adrian@FreeBSD.org> | 2013-08-13 09:58:27 +0000 |
|---|---|---|
| committer | adrian <adrian@FreeBSD.org> | 2013-08-13 09:58:27 +0000 |
| commit | 734677ca723882e48559667f3c84eb5eda07e9f0 (patch) | |
| tree | 13e05809d753b6625b54adf2abca2a0aca6abb38 /sys/dev/bwi | |
| parent | f4100c62aa6a63af38d8f038dfc2d5078aa31968 (diff) | |
| download | FreeBSD-src-734677ca723882e48559667f3c84eb5eda07e9f0.zip FreeBSD-src-734677ca723882e48559667f3c84eb5eda07e9f0.tar.gz | |
ieee80211_rate2plcp() and ieee80211_rate2phytype() are both pre-11n
routines and thus assert if one passes in a rate code with the
high bit set.
Since the high bit can indicate either IEEE80211_RATE_BASIC or
IEEE80211_RATE_MCS, it's up to the caller to determine whether
the rate is 11n or not, and either mask out the BASIC bit, or
call a different function.
(Yes, this does mean that net80211 should grow 11n-aware rate2phytype()
and rate2plcp() functions..)
This may need to happen for the other drivers - it's currently only
done (now) for iwn(4) and bwi(4).
PR: kern/181100
Diffstat (limited to 'sys/dev/bwi')
| -rw-r--r-- | sys/dev/bwi/bwimac.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/bwi/bwimac.c b/sys/dev/bwi/bwimac.c index 703da7a..30b19fc 100644 --- a/sys/dev/bwi/bwimac.c +++ b/sys/dev/bwi/bwimac.c @@ -1427,7 +1427,8 @@ bwi_mac_set_ackrates(struct bwi_mac *mac, const struct ieee80211_rate_table *rt, enum ieee80211_phytype modtype; uint16_t ofs; - modtype = ieee80211_rate2phytype(rt, rs->rs_rates[i]); + modtype = ieee80211_rate2phytype(rt, + rs->rs_rates[i] & IEEE80211_RATE_VAL); switch (modtype) { case IEEE80211_T_DS: ofs = 0x4c0; @@ -1438,7 +1439,9 @@ bwi_mac_set_ackrates(struct bwi_mac *mac, const struct ieee80211_rate_table *rt, default: panic("unsupported modtype %u\n", modtype); } - ofs += 2*(ieee80211_rate2plcp(rs->rs_rates[i], modtype) & 0xf); + ofs += 2*(ieee80211_rate2plcp( + rs->rs_rates[i] & IEEE80211_RATE_VAL, + modtype) & 0xf); MOBJ_WRITE_2(mac, BWI_COMM_MOBJ, ofs + 0x20, MOBJ_READ_2(mac, BWI_COMM_MOBJ, ofs)); |
