Merge branch 'upstream' into upstream-jgarzik

Conflicts:

	net/ieee80211/softmac/ieee80211softmac_module.c
	net/ieee80211/softmac/ieee80211softmac_wx.c

2 files changed, 6 insertions, 18 deletions

diff --git a/net/ieee80211/softmac/ieee80211softmac_module.c b/net/ieee80211/softmac/ieee80211softmac_module.c
index 4f8c3ef70819..e9cdc6615ddc 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;
diff --git a/net/ieee80211/softmac/ieee80211softmac_wx.c b/net/ieee80211/softmac/ieee80211softmac_wx.c
index c306d52566e0..f13937bf9e8c 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) {