Commit ff27fabe authored by Daniel Halperin's avatar Daniel Halperin Committed by John W. Linville

iwlwifi: fix throughput degradation in aggregation mode

The following commit

	commit e4da8c37
	Author: Johannes Berg <johannes@sipsolutions.net>
	Date:   Wed Dec 23 13:15:43 2009 +0100

	   mac80211: make off-channel work generic

triggered a bug in iwlwifi where HT parameters would not be correctly set in
some mac80211 pathways. The aggregation (and possibly other) station flags were
not being set, which limited the size of aggregation blocks and reduced
throughput at high rates.

>From Johannes:
"""
Due to Wey-Yi's patch to use the set-channel command when the channel changes
while associated, we don't get a full new RXON. Therefore, we don't re-set the
rxon-station either. However, under some circumstances that apparently have
gotten more likely mac80211 will first set up the BSS info, then add the
station and then switch to an HT channel type.

Therefore, the check for "priv->current_ht_config.is_ht" in
iwl_rxon_add_station() will hit false and not fill in the HT information.

However, that check can just be removed, which is the easiest fix for all this,
because the HT capa struct is always there, just could possibly have the
ht_supported member set to false.
"""

A sample good link in my 3x3 network improves by approximately 25% TCP
throughput. This fixes Bug 2144
(http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2144).
Signed-off-by: default avatarDaniel Halperin <dhalperi@cs.washington.edu>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 81963d68
...@@ -1045,15 +1045,10 @@ int iwl_rxon_add_station(struct iwl_priv *priv, const u8 *addr, bool is_ap) ...@@ -1045,15 +1045,10 @@ int iwl_rxon_add_station(struct iwl_priv *priv, const u8 *addr, bool is_ap)
struct ieee80211_sta_ht_cap *cur_ht_config = NULL; struct ieee80211_sta_ht_cap *cur_ht_config = NULL;
u8 sta_id; u8 sta_id;
/* Add station to device's station table */
/* /*
* XXX: This check is definitely not correct, if we're an AP * Set HT capabilities. It is ok to set this struct even if not using
* it'll always be false which is not what we want, but * HT config: the priv->current_ht_config.is_ht flag will just be false
* it doesn't look like iwlagn is prepared to be an HT
* AP anyway.
*/ */
if (priv->current_ht_config.is_ht) {
rcu_read_lock(); rcu_read_lock();
sta = ieee80211_find_sta(priv->vif, addr); sta = ieee80211_find_sta(priv->vif, addr);
if (sta) { if (sta) {
...@@ -1061,8 +1056,8 @@ int iwl_rxon_add_station(struct iwl_priv *priv, const u8 *addr, bool is_ap) ...@@ -1061,8 +1056,8 @@ int iwl_rxon_add_station(struct iwl_priv *priv, const u8 *addr, bool is_ap)
cur_ht_config = &ht_config; cur_ht_config = &ht_config;
} }
rcu_read_unlock(); rcu_read_unlock();
}
/* Add station to device's station table */
sta_id = iwl_add_station(priv, addr, is_ap, CMD_SYNC, cur_ht_config); sta_id = iwl_add_station(priv, addr, is_ap, CMD_SYNC, cur_ht_config);
/* Set up default rate scaling table in device's station table */ /* Set up default rate scaling table in device's station table */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment