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

Commit 11c36537 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2015-08-23' of... 

Merge tag 'iwlwifi-next-for-kalle-2015-08-23' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

* new Tx power firmware API
* bump max firmware API to 17
* fix bug in debug prints
* static checker fix
* fix unused defines
* fix command list on newest firmware
parents 4a89ba04 5865f365

drivers/net/wireless/iwlwifi/dvm/agn.h

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ do { \ 
} while (0)

#endif				/* CONFIG_IWLWIFI_DEBUG */



extern const char *const iwl_dvm_cmd_strings[REPLY_MAX];

extern const char *const iwl_dvm_cmd_strings[REPLY_MAX + 1];



static inline const char *iwl_dvm_get_cmd_string(u8 cmd)

{

drivers/net/wireless/iwlwifi/dvm/rx.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 


#define IWL_CMD_ENTRY(x) [x] = #x



const char *const iwl_dvm_cmd_strings[REPLY_MAX] = {

const char *const iwl_dvm_cmd_strings[REPLY_MAX + 1] = {

	IWL_CMD_ENTRY(REPLY_ALIVE),

	IWL_CMD_ENTRY(REPLY_ERROR),

	IWL_CMD_ENTRY(REPLY_ECHO),

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

+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 IWL7260_UCODE_API_MAX	16

#define IWL7260_UCODE_API_MAX	17



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

#define IWL7260_UCODE_API_OK	12

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

+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	16

#define IWL8000_UCODE_API_MAX	17



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

#define IWL8000_UCODE_API_OK	12

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

+3 −0
Original line number Diff line number Diff line
@@ -259,6 +259,8 @@ typedef unsigned int __bitwise__ iwl_ucode_tlv_api_t; 
 * @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

 */

enum iwl_ucode_tlv_api {

	IWL_UCODE_TLV_API_BT_COEX_SPLIT         = (__force iwl_ucode_tlv_api_t)3,
@@ -274,6 +276,7 @@ enum iwl_ucode_tlv_api { 
	IWL_UCODE_TLV_API_STATS_V10		= (__force iwl_ucode_tlv_api_t)19,

	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,

};



typedef unsigned int __bitwise__ iwl_ucode_tlv_capa_t;