Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2638fed7 authored by David Woodhouse's avatar David Woodhouse Committed by John W. Linville
Browse files

[PATCH] softmac: reduce default rate to 11Mbps. 



We don't make much of an attempt to fall back to lower rates, and 54M
just isn't reliable enough for many people. In fact, it's not clear we
even set it to 11M if we're trying to associate with an 802.11b AP.

This patch makes us default to 11M, which ought to work for most people.
When we actually handle dynamic rate adjustment, we can reconsider the
defaults -- but even then, probably it makes as much sense to start at
11M and adjust it upwards as it does to start at 54M and reduce it.

Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 16f43527

net/ieee80211/softmac/ieee80211softmac_module.c

+11 −6
Original line number Diff line number Diff line
@@ -183,16 +183,21 @@ void ieee80211softmac_start(struct net_device *dev) 
	 */

	if (mac->txrates_change)

		oldrates = mac->txrates;

	if (ieee->modulation & IEEE80211_OFDM_MODULATION) {

		mac->txrates.default_rate = IEEE80211_OFDM_RATE_54MB;

		change |= IEEE80211SOFTMAC_TXRATECHG_DEFAULT;

		mac->txrates.default_fallback = IEEE80211_OFDM_RATE_24MB;

		change |= IEEE80211SOFTMAC_TXRATECHG_DEFAULT_FBACK;

	} else if (ieee->modulation & IEEE80211_CCK_MODULATION) {

	/* 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) {

		mac->txrates.default_rate = IEEE80211_CCK_RATE_11MB;

		change |= IEEE80211SOFTMAC_TXRATECHG_DEFAULT;

		mac->txrates.default_fallback = IEEE80211_CCK_RATE_5MB;

		change |= IEEE80211SOFTMAC_TXRATECHG_DEFAULT_FBACK;

	} else if (ieee->modulation & IEEE80211_OFDM_MODULATION) {

		mac->txrates.default_rate = IEEE80211_OFDM_RATE_54MB;

		change |= IEEE80211SOFTMAC_TXRATECHG_DEFAULT;

		mac->txrates.default_fallback = IEEE80211_OFDM_RATE_24MB;

		change |= IEEE80211SOFTMAC_TXRATECHG_DEFAULT_FBACK;

	} else

		assert(0);

	if (mac->txrates_change)

net/ieee80211/softmac/ieee80211softmac_wx.c

+8 −4
Original line number Diff line number Diff line
@@ -135,11 +135,15 @@ ieee80211softmac_wx_set_rate(struct net_device *net_dev, 
	int err = -EINVAL;



	if (in_rate == -1) {

		/* automatic detect */

		if (ieee->modulation & IEEE80211_OFDM_MODULATION)

			in_rate = 54000000;

		else

		/* 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;

		else

			in_rate = 54000000;

	}



	switch (in_rate) {