Commit 97b9b844 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2016-03-30' of... 

Merge tag 'iwlwifi-next-for-kalle-2016-03-30' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

* Support for Link Quality measurement (Aviya)
* Improvements in thermal (Chaya Rachel)
* Various cleanups (many people)
* Improvements in firmware error dump (Golan)
* More work 9000 devices and MSIx (Haim)
* Continuation of the Dynamic Queue Allocation work (Liad)
* Scan timeout to cope with buggy firmware (Luca)
* D0i3 improvements (Luca)
* Make the paging less memory hungry (Matti)
* 9000 new Rx path (Sara)
parents 4da46ceb 46167a8f

drivers/net/wireless/intel/iwlwifi/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -88,16 +88,6 @@ config IWLWIFI_BCAST_FILTERING 
	  If unsure, don't enable this option, as some programs might

	  expect incoming broadcasts for their normal operations.



config IWLWIFI_UAPSD

	bool "enable U-APSD by default"

	depends on IWLMVM

	help

	  Say Y here to enable U-APSD by default. This may cause

	  interoperability problems with some APs, manifesting in lower than

	  expected throughput due to those APs not enabling aggregation



	  If unsure, say N.



config IWLWIFI_PCIE_RTPM

       bool "Enable runtime power management mode for PCIe devices"

       depends on IWLMVM && PM

drivers/net/wireless/intel/iwlwifi/dvm/main.c

+1 −1
Original line number Diff line number Diff line
@@ -1071,7 +1071,7 @@ static void iwl_bg_restart(struct work_struct *data) 


static void iwl_setup_deferred_work(struct iwl_priv *priv)

{

	priv->workqueue = create_singlethread_workqueue(DRV_NAME);

	priv->workqueue = alloc_ordered_workqueue(DRV_NAME, 0);



	INIT_WORK(&priv->restart, iwl_bg_restart);

	INIT_WORK(&priv->beacon_update, iwl_bg_beacon_update);

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

+2 −8
Original line number Diff line number Diff line
@@ -34,10 +34,6 @@ 
#define IWL1000_UCODE_API_MAX 5

#define IWL100_UCODE_API_MAX 5



/* Oldest version we won't warn about */

#define IWL1000_UCODE_API_OK 5

#define IWL100_UCODE_API_OK 5



/* Lowest firmware API version supported */

#define IWL1000_UCODE_API_MIN 1

#define IWL100_UCODE_API_MIN 5
@@ -86,7 +82,6 @@ static const struct iwl_eeprom_params iwl1000_eeprom_params = { 
#define IWL_DEVICE_1000						\

	.fw_name_pre = IWL1000_FW_PRE,				\

	.ucode_api_max = IWL1000_UCODE_API_MAX,			\

	.ucode_api_ok = IWL1000_UCODE_API_OK,			\

	.ucode_api_min = IWL1000_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_1000,		\

	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\
@@ -112,7 +107,6 @@ const struct iwl_cfg iwl1000_bg_cfg = { 
#define IWL_DEVICE_100						\

	.fw_name_pre = IWL100_FW_PRE,				\

	.ucode_api_max = IWL100_UCODE_API_MAX,			\

	.ucode_api_ok = IWL100_UCODE_API_OK,			\

	.ucode_api_min = IWL100_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_100,			\

	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\
@@ -136,5 +130,5 @@ const struct iwl_cfg iwl100_bg_cfg = { 
	IWL_DEVICE_100,

};



MODULE_FIRMWARE(IWL1000_MODULE_FIRMWARE(IWL1000_UCODE_API_OK));

MODULE_FIRMWARE(IWL100_MODULE_FIRMWARE(IWL100_UCODE_API_OK));
 
MODULE_FIRMWARE(IWL1000_MODULE_FIRMWARE(IWL1000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL100_MODULE_FIRMWARE(IWL100_UCODE_API_MAX));

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

+4 −14
Original line number Diff line number Diff line
@@ -36,12 +36,6 @@ 
#define IWL105_UCODE_API_MAX 6

#define IWL135_UCODE_API_MAX 6



/* Oldest version we won't warn about */

#define IWL2030_UCODE_API_OK 6

#define IWL2000_UCODE_API_OK 6

#define IWL105_UCODE_API_OK 6

#define IWL135_UCODE_API_OK 6



/* Lowest firmware API version supported */

#define IWL2030_UCODE_API_MIN 5

#define IWL2000_UCODE_API_MIN 5
@@ -114,7 +108,6 @@ static const struct iwl_eeprom_params iwl20x0_eeprom_params = { 
#define IWL_DEVICE_2000						\

	.fw_name_pre = IWL2000_FW_PRE,				\

	.ucode_api_max = IWL2000_UCODE_API_MAX,			\

	.ucode_api_ok = IWL2000_UCODE_API_OK,			\

	.ucode_api_min = IWL2000_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_2000,		\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\
@@ -142,7 +135,6 @@ const struct iwl_cfg iwl2000_2bgn_d_cfg = { 
#define IWL_DEVICE_2030						\

	.fw_name_pre = IWL2030_FW_PRE,				\

	.ucode_api_max = IWL2030_UCODE_API_MAX,			\

	.ucode_api_ok = IWL2030_UCODE_API_OK,			\

	.ucode_api_min = IWL2030_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_2030,		\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\
@@ -163,7 +155,6 @@ const struct iwl_cfg iwl2030_2bgn_cfg = { 
#define IWL_DEVICE_105						\

	.fw_name_pre = IWL105_FW_PRE,				\

	.ucode_api_max = IWL105_UCODE_API_MAX,			\

	.ucode_api_ok = IWL105_UCODE_API_OK,			\

	.ucode_api_min = IWL105_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_105,			\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\
@@ -191,7 +182,6 @@ const struct iwl_cfg iwl105_bgn_d_cfg = { 
#define IWL_DEVICE_135						\

	.fw_name_pre = IWL135_FW_PRE,				\

	.ucode_api_max = IWL135_UCODE_API_MAX,			\

	.ucode_api_ok = IWL135_UCODE_API_OK,			\

	.ucode_api_min = IWL135_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_135,			\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\
@@ -210,7 +200,7 @@ const struct iwl_cfg iwl135_bgn_cfg = { 
	.ht_params = &iwl2000_ht_params,

};



MODULE_FIRMWARE(IWL2000_MODULE_FIRMWARE(IWL2000_UCODE_API_OK));

MODULE_FIRMWARE(IWL2030_MODULE_FIRMWARE(IWL2030_UCODE_API_OK));

MODULE_FIRMWARE(IWL105_MODULE_FIRMWARE(IWL105_UCODE_API_OK));

MODULE_FIRMWARE(IWL135_MODULE_FIRMWARE(IWL135_UCODE_API_OK));
 
MODULE_FIRMWARE(IWL2000_MODULE_FIRMWARE(IWL2000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL2030_MODULE_FIRMWARE(IWL2030_UCODE_API_MAX));

MODULE_FIRMWARE(IWL105_MODULE_FIRMWARE(IWL105_UCODE_API_MAX));

MODULE_FIRMWARE(IWL135_MODULE_FIRMWARE(IWL135_UCODE_API_MAX));

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

+2 −9
Original line number Diff line number Diff line
@@ -34,10 +34,6 @@ 
#define IWL5000_UCODE_API_MAX 5

#define IWL5150_UCODE_API_MAX 2



/* Oldest version we won't warn about */

#define IWL5000_UCODE_API_OK 5

#define IWL5150_UCODE_API_OK 2



/* Lowest firmware API version supported */

#define IWL5000_UCODE_API_MIN 1

#define IWL5150_UCODE_API_MIN 1
@@ -84,7 +80,6 @@ static const struct iwl_eeprom_params iwl5000_eeprom_params = { 
#define IWL_DEVICE_5000						\

	.fw_name_pre = IWL5000_FW_PRE,				\

	.ucode_api_max = IWL5000_UCODE_API_MAX,			\

	.ucode_api_ok = IWL5000_UCODE_API_OK,			\

	.ucode_api_min = IWL5000_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_5000,		\

	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\
@@ -132,7 +127,6 @@ const struct iwl_cfg iwl5350_agn_cfg = { 
	.name = "Intel(R) WiMAX/WiFi Link 5350 AGN",

	.fw_name_pre = IWL5000_FW_PRE,

	.ucode_api_max = IWL5000_UCODE_API_MAX,

	.ucode_api_ok = IWL5000_UCODE_API_OK,

	.ucode_api_min = IWL5000_UCODE_API_MIN,

	.device_family = IWL_DEVICE_FAMILY_5000,

	.max_inst_size = IWLAGN_RTC_INST_SIZE,
@@ -149,7 +143,6 @@ const struct iwl_cfg iwl5350_agn_cfg = { 
#define IWL_DEVICE_5150						\

	.fw_name_pre = IWL5150_FW_PRE,				\

	.ucode_api_max = IWL5150_UCODE_API_MAX,			\

	.ucode_api_ok = IWL5150_UCODE_API_OK,			\

	.ucode_api_min = IWL5150_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_5150,		\

	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\
@@ -174,5 +167,5 @@ const struct iwl_cfg iwl5150_abg_cfg = { 
	IWL_DEVICE_5150,

};



MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_OK));

MODULE_FIRMWARE(IWL5150_MODULE_FIRMWARE(IWL5150_UCODE_API_OK));
 
MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL5150_MODULE_FIRMWARE(IWL5150_UCODE_API_MAX));

CRA Git | Maintained and supported by SUSTech CRA and CCSE