From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
To: linux-wireless@vger.kernel.org
Cc: Emmanuel Grumbach <emmanuel.grumbach@intel.com>,
<stable@vger.kernel.org>
Subject: [PATCH 02/49] iwlwifi: fix max_ht_ampdu_exponent for older devices
Date: Thu, 12 Mar 2015 15:03:47 +0200 [thread overview]
Message-ID: <1426165474-25586-2-git-send-email-emmanuel.grumbach@intel.com> (raw)
In-Reply-To: <1426164431.19690.4.camel@egrumbacBox>
The commit below didn't update the max_ht_ampdu_exponent
for the devices listed in iwl-[1-6]000.c which, in result,
became 0 instead of 8K. This reduced the size of the Rx
AMPDU from 64K to 8K which had an impact in the Rx
throughput. One user reported that because of this, his
downstream throughput droppped by a half.
CC: <stable@vger.kernel.org> [3.19]
Fixes: c064ddf318aa ("iwlwifi: change max HT and VHT A-MPDU exponent")
Reported-and-tested-by: Valentin Manea <linux-wireless@mrs.ro>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/iwlwifi/iwl-1000.c | 6 ++++--
drivers/net/wireless/iwlwifi/iwl-2000.c | 13 +++++++++----
drivers/net/wireless/iwlwifi/iwl-5000.c | 6 ++++--
drivers/net/wireless/iwlwifi/iwl-6000.c | 18 ++++++++++++------
4 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c
index c3817fa..06f6cc0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
@@ -95,7 +95,8 @@ static const struct iwl_eeprom_params iwl1000_eeprom_params = {
.nvm_calib_ver = EEPROM_1000_TX_POWER_VERSION, \
.base_params = &iwl1000_base_params, \
.eeprom_params = &iwl1000_eeprom_params, \
- .led_mode = IWL_LED_BLINK
+ .led_mode = IWL_LED_BLINK, \
+ .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K
const struct iwl_cfg iwl1000_bgn_cfg = {
.name = "Intel(R) Centrino(R) Wireless-N 1000 BGN",
@@ -121,7 +122,8 @@ const struct iwl_cfg iwl1000_bg_cfg = {
.base_params = &iwl1000_base_params, \
.eeprom_params = &iwl1000_eeprom_params, \
.led_mode = IWL_LED_RF_STATE, \
- .rx_with_siso_diversity = true
+ .rx_with_siso_diversity = true, \
+ .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K
const struct iwl_cfg iwl100_bgn_cfg = {
.name = "Intel(R) Centrino(R) Wireless-N 100 BGN",
diff --git a/drivers/net/wireless/iwlwifi/iwl-2000.c b/drivers/net/wireless/iwlwifi/iwl-2000.c
index 21e5d08..890b95f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-2000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-2000.c
@@ -123,7 +123,9 @@ static const struct iwl_eeprom_params iwl20x0_eeprom_params = {
.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION, \
.base_params = &iwl2000_base_params, \
.eeprom_params = &iwl20x0_eeprom_params, \
- .led_mode = IWL_LED_RF_STATE
+ .led_mode = IWL_LED_RF_STATE, \
+ .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K
+
const struct iwl_cfg iwl2000_2bgn_cfg = {
.name = "Intel(R) Centrino(R) Wireless-N 2200 BGN",
@@ -149,7 +151,8 @@ const struct iwl_cfg iwl2000_2bgn_d_cfg = {
.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION, \
.base_params = &iwl2030_base_params, \
.eeprom_params = &iwl20x0_eeprom_params, \
- .led_mode = IWL_LED_RF_STATE
+ .led_mode = IWL_LED_RF_STATE, \
+ .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K
const struct iwl_cfg iwl2030_2bgn_cfg = {
.name = "Intel(R) Centrino(R) Wireless-N 2230 BGN",
@@ -170,7 +173,8 @@ const struct iwl_cfg iwl2030_2bgn_cfg = {
.base_params = &iwl2000_base_params, \
.eeprom_params = &iwl20x0_eeprom_params, \
.led_mode = IWL_LED_RF_STATE, \
- .rx_with_siso_diversity = true
+ .rx_with_siso_diversity = true, \
+ .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K
const struct iwl_cfg iwl105_bgn_cfg = {
.name = "Intel(R) Centrino(R) Wireless-N 105 BGN",
@@ -197,7 +201,8 @@ const struct iwl_cfg iwl105_bgn_d_cfg = {
.base_params = &iwl2030_base_params, \
.eeprom_params = &iwl20x0_eeprom_params, \
.led_mode = IWL_LED_RF_STATE, \
- .rx_with_siso_diversity = true
+ .rx_with_siso_diversity = true, \
+ .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K
const struct iwl_cfg iwl135_bgn_cfg = {
.name = "Intel(R) Centrino(R) Wireless-N 135 BGN",
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index 332bbede..724194e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -93,7 +93,8 @@ static const struct iwl_eeprom_params iwl5000_eeprom_params = {
.nvm_calib_ver = EEPROM_5000_TX_POWER_VERSION, \
.base_params = &iwl5000_base_params, \
.eeprom_params = &iwl5000_eeprom_params, \
- .led_mode = IWL_LED_BLINK
+ .led_mode = IWL_LED_BLINK, \
+ .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K
const struct iwl_cfg iwl5300_agn_cfg = {
.name = "Intel(R) Ultimate N WiFi Link 5300 AGN",
@@ -158,7 +159,8 @@ const struct iwl_cfg iwl5350_agn_cfg = {
.base_params = &iwl5000_base_params, \
.eeprom_params = &iwl5000_eeprom_params, \
.led_mode = IWL_LED_BLINK, \
- .internal_wimax_coex = true
+ .internal_wimax_coex = true, \
+ .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K
const struct iwl_cfg iwl5150_agn_cfg = {
.name = "Intel(R) WiMAX/WiFi Link 5150 AGN",
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index 8f2c3c8..21b2630 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -145,7 +145,8 @@ static const struct iwl_eeprom_params iwl6000_eeprom_params = {
.nvm_calib_ver = EEPROM_6005_TX_POWER_VERSION, \
.base_params = &iwl6000_g2_base_params, \
.eeprom_params = &iwl6000_eeprom_params, \
- .led_mode = IWL_LED_RF_STATE
+ .led_mode = IWL_LED_RF_STATE, \
+ .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K
const struct iwl_cfg iwl6005_2agn_cfg = {
.name = "Intel(R) Centrino(R) Advanced-N 6205 AGN",
@@ -199,7 +200,8 @@ const struct iwl_cfg iwl6005_2agn_mow2_cfg = {
.nvm_calib_ver = EEPROM_6030_TX_POWER_VERSION, \
.base_params = &iwl6000_g2_base_params, \
.eeprom_params = &iwl6000_eeprom_params, \
- .led_mode = IWL_LED_RF_STATE
+ .led_mode = IWL_LED_RF_STATE, \
+ .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K
const struct iwl_cfg iwl6030_2agn_cfg = {
.name = "Intel(R) Centrino(R) Advanced-N 6230 AGN",
@@ -235,7 +237,8 @@ const struct iwl_cfg iwl6030_2bg_cfg = {
.nvm_calib_ver = EEPROM_6030_TX_POWER_VERSION, \
.base_params = &iwl6000_g2_base_params, \
.eeprom_params = &iwl6000_eeprom_params, \
- .led_mode = IWL_LED_RF_STATE
+ .led_mode = IWL_LED_RF_STATE, \
+ .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K
const struct iwl_cfg iwl6035_2agn_cfg = {
.name = "Intel(R) Centrino(R) Advanced-N 6235 AGN",
@@ -290,7 +293,8 @@ const struct iwl_cfg iwl130_bg_cfg = {
.nvm_calib_ver = EEPROM_6000_TX_POWER_VERSION, \
.base_params = &iwl6000_base_params, \
.eeprom_params = &iwl6000_eeprom_params, \
- .led_mode = IWL_LED_BLINK
+ .led_mode = IWL_LED_BLINK, \
+ .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K
const struct iwl_cfg iwl6000i_2agn_cfg = {
.name = "Intel(R) Centrino(R) Advanced-N 6200 AGN",
@@ -322,7 +326,8 @@ const struct iwl_cfg iwl6000i_2bg_cfg = {
.base_params = &iwl6050_base_params, \
.eeprom_params = &iwl6000_eeprom_params, \
.led_mode = IWL_LED_BLINK, \
- .internal_wimax_coex = true
+ .internal_wimax_coex = true, \
+ .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K
const struct iwl_cfg iwl6050_2agn_cfg = {
.name = "Intel(R) Centrino(R) Advanced-N + WiMAX 6250 AGN",
@@ -347,7 +352,8 @@ const struct iwl_cfg iwl6050_2abg_cfg = {
.base_params = &iwl6050_base_params, \
.eeprom_params = &iwl6000_eeprom_params, \
.led_mode = IWL_LED_BLINK, \
- .internal_wimax_coex = true
+ .internal_wimax_coex = true, \
+ .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K
const struct iwl_cfg iwl6150_bgn_cfg = {
.name = "Intel(R) Centrino(R) Wireless-N + WiMAX 6150 BGN",
--
1.9.1
next prev parent reply other threads:[~2015-03-12 13:04 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-12 12:47 pull request: iwlwifi-next 2013-03-12 Grumbach, Emmanuel
2015-03-12 13:03 ` [PATCH 01/49] iwlwifi: mvm: fix compilation with IWLWIFI_DEBUGFS not set Emmanuel Grumbach
2015-03-12 13:03 ` Emmanuel Grumbach [this message]
2015-03-12 13:03 ` [PATCH 03/49] iwlwifi: mvm: add MCC update FW API Emmanuel Grumbach
2015-03-12 13:03 ` [PATCH 04/49] iwlwifi: mvm: init country code on init/recovery Emmanuel Grumbach
2015-03-12 13:03 ` [PATCH 05/49] iwlwifi: create regdomain from mcc_update_cmd response Emmanuel Grumbach
2015-03-12 13:03 ` [PATCH 06/49] iwlwifi: mvm: consider LAR support during NVM parse Emmanuel Grumbach
2015-03-12 13:03 ` [PATCH 07/49] iwlwifi: ignore IBSS flag as regulatory NO-IR indication Emmanuel Grumbach
2015-03-12 13:03 ` [PATCH 08/49] iwlwifi: don't declare support for 5ghz if not supported Emmanuel Grumbach
2015-03-12 13:03 ` [PATCH 09/49] iwlwifi: mvm: LAR: Add chub mcc change notify command Emmanuel Grumbach
2015-03-12 13:03 ` [PATCH 10/49] iwlwifi: nvm: init correct nvm channel list for 8000 devices Emmanuel Grumbach
2015-03-12 13:03 ` [PATCH 11/49] iwlwifi: change last 5ghz channel to 165 & add support for 8000 family Emmanuel Grumbach
2015-03-12 13:03 ` [PATCH 12/49] iwlwifi: use IWL_DEFAULT_MAX_TX_POWER for max_eirp Emmanuel Grumbach
2015-03-12 13:03 ` [PATCH 13/49] iwlwifi: iwlmvm: LAR: disable LAR support due to NVM vs TLV conflict Emmanuel Grumbach
2015-03-12 13:03 ` [PATCH 14/49] iwlwifi: disable 11ac if 11n is disabled Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 15/49] iwlwifi: mvm: support new PHY_SKU nvm section for family 8000 B0 Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 16/49] iwlwifi: allow disabling LAR via module param Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 17/49] iwlwifi: mvm: take the MAC address from HW registers Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 18/49] iwlwifi: mvm: support LAR updates from BIOS Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 19/49] iwlwifi: mvm: set LAR MCC on D3/D0 transitions Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 20/49] iwlwifi: bump API to 13 for devices that use iwlmvm Emmanuel Grumbach
2015-05-06 9:14 ` Santiago Gala
2015-03-12 13:04 ` [PATCH 21/49] iwlwifi: mvm: remove IWL_UCODE_TLV_API_DISABLE_STA_TX Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 22/49] iwlwifi: mvm: remove IWL_UCODE_TLV_API_SF_NO_DUMMY_NOTIF Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 23/49] iwlwifi: mvm: BT Coex - disable RRC by default Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 24/49] iwlwifi: mvm: always update the quota after association Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 25/49] iwlwifi: mvm: support family 8000 B2/C steps Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 26/49] iwlwifi: pcie: speed up the Tx DMA stop flow Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 27/49] iwlwifi: pcie: include more registers in the prph dump Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 28/49] iwlwifi: fix smatch warning: warn: inconsistent indenting Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 29/49] iwlwifi: use correct NVM offset for LAR enable for new NVMs Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 30/49] iwlwifi: mvm: remove unneeded include iwl-fw-error-dump.h Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 31/49] iwlwifi: mvm: fix identation Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 32/49] iwlwifi: mvm: reflect TDLS pm state in mvmvif->pm_enabled Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 33/49] iwlwifi: don't allow the FW to return invalid ch indices Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 34/49] iwlwifi: mvm: rs: improve ss_params debug print Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 35/49] iwlwifi: add new 8260 series PCI IDs Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 36/49] iwlwifi: trans: Take ownership on secure machine before FW load Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 37/49] iwlwifi: mvm: remove warning on station exhaustion Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 38/49] iwlwifi: mvm: don't init MCC during CT-kill Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 39/49] iwlwifi: mvm: rs: update Tx statistics when using fixed rate Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 40/49] iwlwifi: pcie: allow the op_mode to freeze the stuck queue timer Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 41/49] iwlwifi: mvm: freeze the non-shared queues when a station goes to sleep Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 42/49] iwlwifi: mvm: fix force NMI for 8000 Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 43/49] iwlwifi: mvm: BT Coex - update the new API Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 44/49] iwlwifi: add more new 8260 series PCI IDs Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 45/49] iwlwifi: update copyright to include 2015 Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 46/49] iwlwifi: mvm: Always enable the smart FIFO Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 47/49] iwlwifi: mvm: clarify time event end handling Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 48/49] iwlwifi: mvm: don't double unlock the mutex in __iwl_mvm_resume() Emmanuel Grumbach
2015-03-12 13:04 ` [PATCH 49/49] iwlwifi: mvm: simplify iwl_mvm_get_wakeup_status() return Emmanuel Grumbach
2015-03-13 13:10 ` pull request: iwlwifi-next 2013-03-12 Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1426165474-25586-2-git-send-email-emmanuel.grumbach@intel.com \
--to=emmanuel.grumbach@intel.com \
--cc=linux-wireless@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).