34c34
< __FBSDID("$FreeBSD: head/sys/net80211/ieee80211.c 160690 2006-07-26 03:15:16Z sam $");
---
> __FBSDID("$FreeBSD: head/sys/net80211/ieee80211.c 164645 2006-11-26 22:48:03Z sam $");
63a64,76
> /*
> * Default supported rates for 802.11 operation (in IEEE .5Mb units).
> */
> #define B(r) ((r) | IEEE80211_RATE_BASIC)
> static const struct ieee80211_rateset ieee80211_rateset_11a =
> { 8, { B(12), 18, B(24), 36, B(48), 72, 96, 108 } };
> static const struct ieee80211_rateset ieee80211_rateset_11b =
> { 4, { B(2), B(4), B(11), B(22) } };
> /* NB: OFDM rates are handled specially based on mode */
> static const struct ieee80211_rateset ieee80211_rateset_11g =
> { 12, { B(2), B(4), B(11), B(22), 12, 18, 24, 36, 48, 72, 96, 108 } };
> #undef B
>
123a137,138
> #define RATESDEFINED(m) \
> ((ic->ic_modecaps & (1<<m)) && ic->ic_sup_rates[m].rs_nrates != 0)
181a197,208
>
> /* fillin well-known rate sets if driver has not specified */
> if (!RATESDEFINED(IEEE80211_MODE_11B))
> ic->ic_sup_rates[IEEE80211_MODE_11B] = ieee80211_rateset_11b;
> if (!RATESDEFINED(IEEE80211_MODE_11G))
> ic->ic_sup_rates[IEEE80211_MODE_11G] = ieee80211_rateset_11g;
> if (!RATESDEFINED(IEEE80211_MODE_11A))
> ic->ic_sup_rates[IEEE80211_MODE_11A] = ieee80211_rateset_11a;
> if (!RATESDEFINED(IEEE80211_MODE_TURBO_A))
> ic->ic_sup_rates[IEEE80211_MODE_TURBO_A] = ieee80211_rateset_11a;
> if (!RATESDEFINED(IEEE80211_MODE_TURBO_G))
> ic->ic_sup_rates[IEEE80211_MODE_TURBO_G] = ieee80211_rateset_11g;
216a244
> #undef RATESDEFINED