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

Commit eb9f75d8 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-for-kalle-2015-03-05' of... 

Merge tag 'iwlwifi-for-kalle-2015-03-05' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes

* fix ROC removal - avoids a firmware crash
* fix throughput regression on iwldvm devices
* fix panic in BT Coex
* fixes in rate control
* fixes in scan
parents c8f03455 4cd4b50c

drivers/net/wireless/iwlwifi/iwl-1000.c

+4 −2
Original line number Diff line number Diff line
@@ -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",

drivers/net/wireless/iwlwifi/iwl-2000.c

+9 −4
Original line number Diff line number Diff line
@@ -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",

drivers/net/wireless/iwlwifi/iwl-5000.c

+4 −2
Original line number Diff line number Diff line
@@ -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",

drivers/net/wireless/iwlwifi/iwl-6000.c

+12 −6
Original line number Diff line number Diff line
@@ -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",

drivers/net/wireless/iwlwifi/mvm/coex.c

+2 −1
Original line number Diff line number Diff line
@@ -793,7 +793,8 @@ static void iwl_mvm_bt_notif_iterator(void *_data, u8 *mac, 
	if (!vif->bss_conf.assoc)

		smps_mode = IEEE80211_SMPS_AUTOMATIC;



	if (IWL_COEX_IS_RRC_ON(mvm->last_bt_notif.ttc_rrc_status,

	if (mvmvif->phy_ctxt &&

	    IWL_COEX_IS_RRC_ON(mvm->last_bt_notif.ttc_rrc_status,

			       mvmvif->phy_ctxt->id))

		smps_mode = IEEE80211_SMPS_AUTOMATIC;