25c25
< * $FreeBSD: head/sys/net80211/ieee80211_phy.h 193072 2009-05-29 23:39:16Z sam $
---
> * $FreeBSD: head/sys/net80211/ieee80211_phy.h 252727 2013-07-04 21:16:49Z adrian $
62a63,64
> #define IEEE80211_RATE_TABLE_SIZE 128
>
77c79
< } info[32];
---
> } info[IEEE80211_RATE_TABLE_SIZE];
86c88,95
< uint8_t cix = rt->info[rt->rateCodeToIndex[rate]].ctlRateIndex;
---
> /*
> * XXX Assert this is for a legacy rate; not for an MCS rate.
> * If the caller wishes to use it for a basic rate, they should
> * clear the high bit first.
> */
> KASSERT(! (rate & 0x80), ("rate %d is basic/mcs?", rate));
>
> uint8_t cix = rt->info[rt->rateCodeToIndex[rate & IEEE80211_RATE_VAL]].ctlRateIndex;
94c103,110
< uint8_t cix = rt->info[rt->rateCodeToIndex[rate]].ctlRateIndex;
---
> /*
> * XXX Assert this is for a legacy rate; not for an MCS rate.
> * If the caller wishes to use it for a basic rate, they should
> * clear the high bit first.
> */
> KASSERT(! (rate & 0x80), ("rate %d is basic/mcs?", rate));
>
> uint8_t cix = rt->info[rt->rateCodeToIndex[rate & IEEE80211_RATE_VAL]].ctlRateIndex;
102c118,125
< uint8_t rix = rt->rateCodeToIndex[rate];
---
> /*
> * XXX Assert this is for a legacy rate; not for an MCS rate.
> * If the caller wishes to use it for a basic rate, they should
> * clear the high bit first.
> */
> KASSERT(! (rate & 0x80), ("rate %d is basic/mcs?", rate));
>
> uint8_t rix = rt->rateCodeToIndex[rate & IEEE80211_RATE_VAL];
109a133,139
> /*
> * XXX Assert this is for a legacy rate; not for an MCS rate.
> * If the caller wishes to use it for a basic rate, they should
> * clear the high bit first.
> */
> KASSERT(! (rate & 0x80), ("rate %d is basic/mcs?", rate));
>
136a167,174
> static __inline__ uint8_t
> ieee80211_legacy_rate_lookup(const struct ieee80211_rate_table *rt,
> uint8_t rate)
> {
>
> return (rt->rateCodeToIndex[rate & IEEE80211_RATE_VAL]);
> }
>
153a192,196
>
> uint32_t ieee80211_compute_duration_ht(uint32_t frameLen,
> uint16_t rate, int streams, int isht40,
> int isShortGI);
>