Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next (d5234cb2) · Commits · 戴 / test

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -69,8 +69,8 @@
		#include "iwl-agn-hw.h"

		/* Highest firmware API version supported */
		#define IWL7260_UCODE_API_MAX 10
		#define IWL3160_UCODE_API_MAX 10
		#define IWL7260_UCODE_API_MAX 12
		#define IWL3160_UCODE_API_MAX 12

		/* Oldest version we won't warn about */
		#define IWL7260_UCODE_API_OK 10
		@@ -111,7 +111,7 @@
		#define IWL7265_MODULE_FIRMWARE(api) IWL7265_FW_PRE __stringify(api) ".ucode"

		#define IWL7265D_FW_PRE "iwlwifi-7265D-"
		#define IWL7265D_MODULE_FIRMWARE(api) IWL7265_FW_PRE __stringify(api) ".ucode"
		#define IWL7265D_MODULE_FIRMWARE(api) IWL7265D_FW_PRE __stringify(api) ".ucode"

		#define NVM_HW_SECTION_NUM_FAMILY_7000 0

+1 −1

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@
		#include "iwl-agn-hw.h"

		/* Highest firmware API version supported */
		#define IWL8000_UCODE_API_MAX 10
		#define IWL8000_UCODE_API_MAX 12

		/* Oldest version we won't warn about */
		#define IWL8000_UCODE_API_OK 10

+1 −1

Original line number	Diff line number	Diff line
		@@ -1261,10 +1261,10 @@ static void iwl_req_fw_callback(const struct firmware ucode_raw, void context)

		try_again:
		/* try next, if any */
		kfree(pieces);
		release_firmware(ucode_raw);
		if (iwl_request_firmware(drv, false))
		goto out_unbind;
		kfree(pieces);
		return;

		out_free_fw:

+1 −0

Original line number	Diff line number	Diff line
		@@ -310,6 +310,7 @@ static inline unsigned int FH_MEM_CBBC_QUEUE(unsigned int chnl)
		#define FH_RSSR_CHNL0_RX_STATUS_CHNL_IDLE (0x01000000)

		#define FH_MEM_TFDIB_REG1_ADDR_BITSHIFT 28
		#define FH_MEM_TB_MAX_LENGTH (0x00020000)

		/* TFDB Area - TFDs buffer table */
		#define FH_MEM_TFDIB_DRAM_ADDR_LSB_MSK (0xFFFFFFFF)

+2 −0

Original line number	Diff line number	Diff line
		@@ -246,6 +246,7 @@ enum iwl_ucode_tlv_flag {
		* the actual dwell time.
		* @IWL_UCODE_TLV_API_SCD_CFG: This firmware can configure the scheduler
		* through the dedicated host command.
		* @IWL_UCODE_TLV_API_SINGLE_SCAN_EBS: EBS is supported for single scans too.
		* @IWL_UCODE_TLV_API_ASYNC_DTM: Async temperature notifications are supported.
		*/
		enum iwl_ucode_tlv_api {
		@@ -256,6 +257,7 @@ enum iwl_ucode_tlv_api {
		IWL_UCODE_TLV_API_FRAGMENTED_SCAN = BIT(8),
		IWL_UCODE_TLV_API_BASIC_DWELL = BIT(13),
		IWL_UCODE_TLV_API_SCD_CFG = BIT(15),
		IWL_UCODE_TLV_API_SINGLE_SCAN_EBS = BIT(16),
		IWL_UCODE_TLV_API_ASYNC_DTM = BIT(17),
		};