diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-20 11:28:42 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-20 11:28:42 -0500 |
| commit | 6606e17a7f1c3bc1b1e83d0c517f11d094e55bf1 (patch) | |
| tree | 83f20d0d3c12d9db75fdfc74454d781d2e4ea590 /net/ieee80211/softmac/ieee80211softmac_wx.c | |
| parent | 6aab44475a1355365f0a24abe6f8eb32185a701e (diff) | |
| parent | b312362be6d9155b66f3a26d9159e0a680fbd6c5 (diff) | |
Merge branch 'upstream-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Diffstat (limited to 'net/ieee80211/softmac/ieee80211softmac_wx.c')
| -rw-r--r-- | net/ieee80211/softmac/ieee80211softmac_wx.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/net/ieee80211/softmac/ieee80211softmac_wx.c b/net/ieee80211/softmac/ieee80211softmac_wx.c index c306d52566e..f13937bf9e8 100644 --- a/net/ieee80211/softmac/ieee80211softmac_wx.c +++ b/net/ieee80211/softmac/ieee80211softmac_wx.c @@ -177,15 +177,10 @@ ieee80211softmac_wx_set_rate(struct net_device *net_dev, int err = -EINVAL; if (in_rate == -1) { - /* 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) - in_rate = 11000000; + if (ieee->modulation & IEEE80211_OFDM_MODULATION) + in_rate = 24000000; else - in_rate = 54000000; + in_rate = 11000000; } switch (in_rate) { |