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

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

Merge tag 'iwlwifi-next-for-kalle-2016-01-07_2' of... 

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

* bug fixes and improvements for firmware debug system (Golan and myself)
* fixes for D0i3 (Eliad)
* prevent muliple stations with the same MAC address
* advertise support for Rx A-MSDU in A-MPDU
* scan related fixes
* support -20.ucode
* fix WoWLAN for iwldvm
* preparations towards multiple Rx queues
* platform power improvements for GO mode when no clients are associated
parents 236c52ca 62d7476d

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -1154,6 +1154,9 @@ int iwlagn_suspend(struct iwl_priv *priv, struct cfg80211_wowlan *wowlan) 




	priv->ucode_loaded = false;

	priv->ucode_loaded = false;

	iwl_trans_stop_device(priv->trans);

	iwl_trans_stop_device(priv->trans);

	ret = iwl_trans_start_hw(priv->trans);

	if (ret)

		goto out;





	priv->wowlan = true;

	priv->wowlan = true;

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -72,8 +72,8 @@ 




/* Highest firmware API version supported */

/* Highest firmware API version supported */

#define IWL7260_UCODE_API_MAX	17

#define IWL7260_UCODE_API_MAX	17

#define IWL7265_UCODE_API_MAX	19

#define IWL7265_UCODE_API_MAX	17

#define IWL7265D_UCODE_API_MAX	19

#define IWL7265D_UCODE_API_MAX	20





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

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

#define IWL7260_UCODE_API_OK	13

#define IWL7260_UCODE_API_OK	13

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

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

#include "iwl-agn-hw.h"





/* Highest firmware API version supported */

/* Highest firmware API version supported */

#define IWL8000_UCODE_API_MAX	19

#define IWL8000_UCODE_API_MAX	20





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

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

#define IWL8000_UCODE_API_OK	13

#define IWL8000_UCODE_API_OK	13

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

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

#include "iwl-agn-hw.h"





/* Highest firmware API version supported */

/* Highest firmware API version supported */

#define IWL9000_UCODE_API_MAX	16

#define IWL9000_UCODE_API_MAX	20





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

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

#define IWL9000_UCODE_API_OK	13

#define IWL9000_UCODE_API_OK	13

drivers/net/wireless/intel/iwlwifi/iwl-fw-error-dump.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -88,6 +88,7 @@ 
 *	&struct iwl_fw_error_dump_rb

 *	&struct iwl_fw_error_dump_rb

 * @IWL_FW_ERROR_PAGING: UMAC's image memory segments which were

 * @IWL_FW_ERROR_PAGING: UMAC's image memory segments which were

 *	paged to the DRAM.

 *	paged to the DRAM.

 * @IWL_FW_ERROR_DUMP_RADIO_REG: Dump the radio registers.

 */

 */

enum iwl_fw_error_dump_type {

enum iwl_fw_error_dump_type {

	/* 0 is deprecated */

	/* 0 is deprecated */
@@ -103,6 +104,7 @@ enum iwl_fw_error_dump_type { 
	IWL_FW_ERROR_DUMP_ERROR_INFO = 10,

	IWL_FW_ERROR_DUMP_ERROR_INFO = 10,

	IWL_FW_ERROR_DUMP_RB = 11,

	IWL_FW_ERROR_DUMP_RB = 11,

	IWL_FW_ERROR_DUMP_PAGING = 12,

	IWL_FW_ERROR_DUMP_PAGING = 12,

	IWL_FW_ERROR_DUMP_RADIO_REG = 13,





	IWL_FW_ERROR_DUMP_MAX,

	IWL_FW_ERROR_DUMP_MAX,

};

};