lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'upstream' into upstream-jgarzik

Browse Source 
Conflicts:

	net/ieee80211/softmac/ieee80211softmac_module.c
	net/ieee80211/softmac/ieee80211softmac_wx.c
This commit is contained in:
John W. Linville
2007-02-17 18:26:09 -05:00
parent bdcac1878c bb52a653ea
commit b312362be6
18 changed files with 157 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
net/ieee80211/softmac/ieee80211softmac_module.c
View File

@@ -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;

11
net/ieee80211/softmac/ieee80211softmac_wx.c
View File

@@ -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) {