diff options
| author | John W. Linville <linville@tuxdriver.com> | 2007-02-17 18:26:09 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2007-02-17 18:26:09 -0500 |
| commit | b312362be6d9155b66f3a26d9159e0a680fbd6c5 (patch) | |
| tree | 52ebaad6117abf806dab4e738d01b509839f7b12 /net/ieee80211/softmac/ieee80211softmac_module.c | |
| parent | bdcac1878c80b068d8e073c1691d4bd09ba9996d (diff) | |
| parent | bb52a653eaef4aee877b2fa36de8699926f788bd (diff) | |
| download | linux-b312362be6d9155b66f3a26d9159e0a680fbd6c5.tar.gz | |
Merge branch 'upstream' into upstream-jgarzik
Conflicts:
net/ieee80211/softmac/ieee80211softmac_module.c
net/ieee80211/softmac/ieee80211softmac_wx.c
Diffstat (limited to 'net/ieee80211/softmac/ieee80211softmac_module.c')
| -rw-r--r-- | net/ieee80211/softmac/ieee80211softmac_module.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/net/ieee80211/softmac/ieee80211softmac_module.c b/net/ieee80211/softmac/ieee80211softmac_module.c index 4f8c3ef7081950..e9cdc6615ddc74 100644 --- a/net/ieee80211/softmac/ieee80211softmac_module.c +++ b/net/ieee80211/softmac/ieee80211softmac_module.c @@ -265,17 +265,10 @@ void ieee80211softmac_init_bss(struct ieee80211softmac_device *mac) /* Change the default txrate to the highest possible value. * The txrate machine will lower it, if it is too high. */ - /* FIXME: We don't correctly handle backing down to lower - rates, so 801.11g devices start off at 11M for now. People - can manually change it if they really need to, but 11M is - more reliable. Note similar logic in - ieee80211softmac_wx_set_rate() */ - if (ieee->modulation & IEEE80211_CCK_MODULATION) { + if (ieee->modulation & IEEE80211_OFDM_MODULATION) + txrates->user_rate = IEEE80211_OFDM_RATE_24MB; + else txrates->user_rate = IEEE80211_CCK_RATE_11MB; - } else if (ieee->modulation & IEEE80211_OFDM_MODULATION) { - txrates->user_rate = IEEE80211_OFDM_RATE_54MB; - } else - assert(0); txrates->default_rate = IEEE80211_CCK_RATE_1MB; change |= IEEE80211SOFTMAC_TXRATECHG_DEFAULT; |