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

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

Merge tag 'iwlwifi-for-kalle-2017-06-05' of... 

Merge tag 'iwlwifi-for-kalle-2017-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes

Fixes for 4.12:

* Some memory leaks;
* IBSS support;
* Some bugzilla bugs;
* Some runtime PM fixes;
* Rate-scaling issues;
* Some locking problems;
parents 1dbf647f dc1cd1d5

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

+2 −2
Original line number Diff line number Diff line
@@ -79,8 +79,8 @@ 
/* Lowest firmware API version supported */

#define IWL7260_UCODE_API_MIN	17

#define IWL7265_UCODE_API_MIN	17

#define IWL7265D_UCODE_API_MIN	17

#define IWL3168_UCODE_API_MIN	20

#define IWL7265D_UCODE_API_MIN	22

#define IWL3168_UCODE_API_MIN	22



/* NVM versions */

#define IWL7260_NVM_VERSION		0x0a1d

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

+2 −2
Original line number Diff line number Diff line
@@ -74,8 +74,8 @@ 
#define IWL8265_UCODE_API_MAX	30



/* Lowest firmware API version supported */

#define IWL8000_UCODE_API_MIN	17

#define IWL8265_UCODE_API_MIN	20

#define IWL8000_UCODE_API_MIN	22

#define IWL8265_UCODE_API_MIN	22



/* NVM versions */

#define IWL8000_NVM_VERSION		0x0a1d

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

+1 −0
Original line number Diff line number Diff line
@@ -370,6 +370,7 @@ 
#define MON_DMARB_RD_DATA_ADDR		(0xa03c5c)



#define DBGC_IN_SAMPLE			(0xa03c00)

#define DBGC_OUT_CTRL			(0xa03c0c)



/* enable the ID buf for read */

#define WFPM_PS_CTL_CLR			0xA0300C

drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rs.h

+5 −0
Original line number Diff line number Diff line
@@ -307,6 +307,11 @@ enum { 
/* Bit 1-3: LQ command color. Used to match responses to LQ commands */

#define LQ_FLAG_COLOR_POS               1

#define LQ_FLAG_COLOR_MSK               (7 << LQ_FLAG_COLOR_POS)

#define LQ_FLAG_COLOR_GET(_f)		(((_f) & LQ_FLAG_COLOR_MSK) >>\

					 LQ_FLAG_COLOR_POS)

#define LQ_FLAGS_COLOR_INC(_c)		((((_c) + 1) << LQ_FLAG_COLOR_POS) &\

					 LQ_FLAG_COLOR_MSK)

#define LQ_FLAG_COLOR_SET(_f, _c)	((_c) | ((_f) & ~LQ_FLAG_COLOR_MSK))



/* Bit 4-5: Tx RTS BW Signalling

 * (0) No RTS BW signalling

drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tx.h

+3 −0
Original line number Diff line number Diff line
@@ -519,8 +519,11 @@ struct agg_tx_status { 
 * bit-7 invalid rate indication

 */

#define TX_RES_INIT_RATE_INDEX_MSK 0x0f

#define TX_RES_RATE_TABLE_COLOR_POS 4

#define TX_RES_RATE_TABLE_COLOR_MSK 0x70

#define TX_RES_INV_RATE_INDEX_MSK 0x80

#define TX_RES_RATE_TABLE_COL_GET(_f) (((_f) & TX_RES_RATE_TABLE_COLOR_MSK) >>\

				       TX_RES_RATE_TABLE_COLOR_POS)



#define IWL_MVM_TX_RES_GET_TID(_ra_tid) ((_ra_tid) & 0x0f)

#define IWL_MVM_TX_RES_GET_RA(_ra_tid) ((_ra_tid) >> 4)