aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2007-02-17 18:26:09 -0500
committerJohn W. Linville <linville@tuxdriver.com>2007-02-17 18:26:09 -0500
commitb312362be6d9155b66f3a26d9159e0a680fbd6c5 (patch)
tree52ebaad6117abf806dab4e738d01b509839f7b12 /net
parentbdcac1878c80b068d8e073c1691d4bd09ba9996d (diff)
parentbb52a653eaef4aee877b2fa36de8699926f788bd (diff)
Merge branch 'upstream' into upstream-jgarzik
Conflicts: net/ieee80211/softmac/ieee80211softmac_module.c net/ieee80211/softmac/ieee80211softmac_wx.c
Diffstat (limited to 'net')
-rw-r--r--net/ieee80211/softmac/ieee80211softmac_module.c13
-rw-r--r--net/ieee80211/softmac/ieee80211softmac_wx.c11
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)
265 /* Change the default txrate to the highest possible value. 265 /* Change the default txrate to the highest possible value.
266 * The txrate machine will lower it, if it is too high. 266 * The txrate machine will lower it, if it is too high.
267 */ 267 */
268 /* FIXME: We don't correctly handle backing down to lower 268 if (ieee->modulation & IEEE80211_OFDM_MODULATION)
269 rates, so 801.11g devices start off at 11M for now. People 269 txrates->user_rate = IEEE80211_OFDM_RATE_24MB;
270 can manually change it if they really need to, but 11M is 270 else
271 more reliable. Note similar logic in
272 ieee80211softmac_wx_set_rate() */
273 if (ieee->modulation & IEEE80211_CCK_MODULATION) {
274 txrates->user_rate = IEEE80211_CCK_RATE_11MB; 271 txrates->user_rate = IEEE80211_CCK_RATE_11MB;
275 } else if (ieee->modulation & IEEE80211_OFDM_MODULATION) {
276 txrates->user_rate = IEEE80211_OFDM_RATE_54MB;
277 } else
278 assert(0);
279 272
280 txrates->default_rate = IEEE80211_CCK_RATE_1MB; 273 txrates->default_rate = IEEE80211_CCK_RATE_1MB;
281 change |= IEEE80211SOFTMAC_TXRATECHG_DEFAULT; 274 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,
177 int err = -EINVAL; 177 int err = -EINVAL;
178 178
179 if (in_rate == -1) { 179 if (in_rate == -1) {
180 /* FIXME: We don't correctly handle backing down to lower 180 if (ieee->modulation & IEEE80211_OFDM_MODULATION)
181 rates, so 801.11g devices start off at 11M for now. People 181 in_rate = 24000000;
182 can manually change it if they really need to, but 11M is
183 more reliable. Note similar logic in
184 ieee80211softmac_wx_set_rate() */
185 if (ieee->modulation & IEEE80211_CCK_MODULATION)
186 in_rate = 11000000;
187 else 182 else
188 in_rate = 54000000; 183 in_rate = 11000000;
189 } 184 }
190 185
191 switch (in_rate) { 186 switch (in_rate) {