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

Commit 643d09f4 authored by Kalle Valo's avatar Kalle Valo
Browse files

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

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

* bump firmware version to load newer firmwares
parents 57d8f7dd ad38844b

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

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

#define IWL7260_UCODE_API_MAX	17

#define IWL7265_UCODE_API_MAX	17

#define IWL7265D_UCODE_API_MAX	21

#define IWL3168_UCODE_API_MAX	21

#define IWL7265D_UCODE_API_MAX	24

#define IWL3168_UCODE_API_MAX	24



/* Lowest firmware API version supported */

#define IWL7260_UCODE_API_MIN	16

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

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



/* Highest firmware API version supported */

#define IWL8000_UCODE_API_MAX	21

#define IWL8265_UCODE_API_MAX	21

#define IWL8000_UCODE_API_MAX	24

#define IWL8265_UCODE_API_MAX	24



/* Lowest firmware API version supported */

#define IWL8000_UCODE_API_MIN	16

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

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



/* Highest firmware API version supported */

#define IWL9000_UCODE_API_MAX	21

#define IWL9000_UCODE_API_MAX	24



/* Lowest firmware API version supported */

#define IWL9000_UCODE_API_MIN	16