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

Commit 0ad523c8 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2015-09-26' of... 

Merge tag 'iwlwifi-next-for-kalle-2015-09-26' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

* Some new HW IDs;
* Small fix in CTDP error handling;
* Remove support for older firmwares;
* Clean-ups and a few simple fixes here and there.
parents 2df86ad9 9cd70e80

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

+3 −3
Original line number Diff line number Diff line
@@ -77,9 +77,9 @@ 
#define IWL3168_UCODE_API_MAX	26



/* Lowest firmware API version supported */

#define IWL7260_UCODE_API_MIN	16

#define IWL7265_UCODE_API_MIN	16

#define IWL7265D_UCODE_API_MIN	16

#define IWL7260_UCODE_API_MIN	17

#define IWL7265_UCODE_API_MIN	17

#define IWL7265D_UCODE_API_MIN	17

#define IWL3168_UCODE_API_MIN	20



/* NVM versions */

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

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 
#define IWL8265_UCODE_API_MAX	26



/* Lowest firmware API version supported */

#define IWL8000_UCODE_API_MIN	16

#define IWL8000_UCODE_API_MIN	17

#define IWL8265_UCODE_API_MIN	20



/* NVM versions */

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

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
#define IWL9000_UCODE_API_MAX	26



/* Lowest firmware API version supported */

#define IWL9000_UCODE_API_MIN	16

#define IWL9000_UCODE_API_MIN	17



/* NVM versions */

#define IWL9000_NVM_VERSION		0x0a1d

drivers/net/wireless/intel/iwlwifi/iwl-config.h

+0 −1
Original line number Diff line number Diff line
@@ -359,7 +359,6 @@ struct iwl_cfg { 
	    high_temp:1,

	    mac_addr_from_csr:1,

	    lp_xtal_workaround:1,

	    no_power_up_nic_in_init:1,

	    disable_dummy_notification:1,

	    apmg_not_supported:1,

	    mq_rx_supported:1,

drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h

+1 −23
Original line number Diff line number Diff line
@@ -199,8 +199,6 @@ struct iwl_ucode_capa { 
 * @IWL_UCODE_TLV_FLAGS_NEWSCAN: new uCode scan behavior on hidden SSID,

 *	treats good CRC threshold as a boolean

 * @IWL_UCODE_TLV_FLAGS_MFP: This uCode image supports MFP (802.11w).

 * @IWL_UCODE_TLV_FLAGS_P2P: This uCode image supports P2P.

 * @IWL_UCODE_TLV_FLAGS_DW_BC_TABLE: The SCD byte count table is in DWORDS

 * @IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT: This uCode image supports uAPSD

 * @IWL_UCODE_TLV_FLAGS_SHORT_BL: 16 entries of black list instead of 64 in scan

 *	offload profile config command.
@@ -210,36 +208,24 @@ struct iwl_ucode_capa { 
 *	from the probe request template.

 * @IWL_UCODE_TLV_FLAGS_NEW_NSOFFL_SMALL: new NS offload (small version)

 * @IWL_UCODE_TLV_FLAGS_NEW_NSOFFL_LARGE: new NS offload (large version)

 * @IWL_UCODE_TLV_FLAGS_P2P_PM: P2P client supports PM as a stand alone MAC

 * @IWL_UCODE_TLV_FLAGS_P2P_BSS_PS_DCM: support power save on BSS station and

 *	P2P client interfaces simultaneously if they are in different bindings.

 * @IWL_UCODE_TLV_FLAGS_P2P_BSS_PS_SCM: support power save on BSS station and

 *	P2P client interfaces simultaneously if they are in same bindings.

 * @IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT: General support for uAPSD

 * @IWL_UCODE_TLV_FLAGS_P2P_PS_UAPSD: P2P client supports uAPSD power save

 * @IWL_UCODE_TLV_FLAGS_BCAST_FILTERING: uCode supports broadcast filtering.

 * @IWL_UCODE_TLV_FLAGS_GO_UAPSD: AP/GO interfaces support uAPSD clients

 * @IWL_UCODE_TLV_FLAGS_EBS_SUPPORT: this uCode image supports EBS.

 */

enum iwl_ucode_tlv_flag {

	IWL_UCODE_TLV_FLAGS_PAN			= BIT(0),

	IWL_UCODE_TLV_FLAGS_NEWSCAN		= BIT(1),

	IWL_UCODE_TLV_FLAGS_MFP			= BIT(2),

	IWL_UCODE_TLV_FLAGS_P2P			= BIT(3),

	IWL_UCODE_TLV_FLAGS_DW_BC_TABLE		= BIT(4),

	IWL_UCODE_TLV_FLAGS_SHORT_BL		= BIT(7),

	IWL_UCODE_TLV_FLAGS_D3_6_IPV6_ADDRS	= BIT(10),

	IWL_UCODE_TLV_FLAGS_NO_BASIC_SSID	= BIT(12),

	IWL_UCODE_TLV_FLAGS_NEW_NSOFFL_SMALL	= BIT(15),

	IWL_UCODE_TLV_FLAGS_NEW_NSOFFL_LARGE	= BIT(16),

	IWL_UCODE_TLV_FLAGS_P2P_PM		= BIT(21),

	IWL_UCODE_TLV_FLAGS_BSS_P2P_PS_DCM	= BIT(22),

	IWL_UCODE_TLV_FLAGS_BSS_P2P_PS_SCM	= BIT(23),

	IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT	= BIT(24),

	IWL_UCODE_TLV_FLAGS_EBS_SUPPORT		= BIT(25),

	IWL_UCODE_TLV_FLAGS_P2P_PS_UAPSD	= BIT(26),

	IWL_UCODE_TLV_FLAGS_BCAST_FILTERING	= BIT(29),

	IWL_UCODE_TLV_FLAGS_GO_UAPSD		= BIT(30),

};



typedef unsigned int __bitwise__ iwl_ucode_tlv_api_t;
@@ -249,13 +235,8 @@ typedef unsigned int __bitwise__ iwl_ucode_tlv_api_t; 
 * @IWL_UCODE_TLV_API_FRAGMENTED_SCAN: This ucode supports active dwell time

 *	longer than the passive one, which is essential for fragmented scan.

 * @IWL_UCODE_TLV_API_WIFI_MCC_UPDATE: ucode supports MCC updates with source.

 * @IWL_UCODE_TLV_API_WIDE_CMD_HDR: ucode supports wide command header

 * @IWL_UCODE_TLV_API_LQ_SS_PARAMS: Configure STBC/BFER via LQ CMD ss_params

 * @IWL_UCODE_TLV_API_NEW_VERSION: new versioning format

 * @IWL_UCODE_TLV_API_EXT_SCAN_PRIORITY: scan APIs use 8-level priority

 *	instead of 3.

 * @IWL_UCODE_TLV_API_TX_POWER_CHAIN: TX power API has larger command size

 *	(command version 3) that supports per-chain limits

 * @IWL_UCODE_TLV_API_SCAN_TSF_REPORT: Scan start time reported in scan

 *	iteration complete notification, and the timestamp reported for RX

 *	received during scan, are reported in TSF of the mac specified in the
@@ -266,11 +247,8 @@ typedef unsigned int __bitwise__ iwl_ucode_tlv_api_t; 
enum iwl_ucode_tlv_api {

	IWL_UCODE_TLV_API_FRAGMENTED_SCAN	= (__force iwl_ucode_tlv_api_t)8,

	IWL_UCODE_TLV_API_WIFI_MCC_UPDATE	= (__force iwl_ucode_tlv_api_t)9,

	IWL_UCODE_TLV_API_WIDE_CMD_HDR		= (__force iwl_ucode_tlv_api_t)14,

	IWL_UCODE_TLV_API_LQ_SS_PARAMS		= (__force iwl_ucode_tlv_api_t)18,

	IWL_UCODE_TLV_API_NEW_VERSION		= (__force iwl_ucode_tlv_api_t)20,

	IWL_UCODE_TLV_API_EXT_SCAN_PRIORITY	= (__force iwl_ucode_tlv_api_t)24,

	IWL_UCODE_TLV_API_TX_POWER_CHAIN	= (__force iwl_ucode_tlv_api_t)27,

	IWL_UCODE_TLV_API_SCAN_TSF_REPORT	= (__force iwl_ucode_tlv_api_t)28,



	NUM_IWL_UCODE_TLV_API