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

* bump firmware version to load newer firmwares

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-7000.c b/drivers/net/wireless/intel/iwlwifi/iwl-7000.c
index f4d9215..64690c1 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-7000.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-7000.c
@@ -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

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
index 8bf11c9..6c6725e 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
@@ -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

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-9000.c b/drivers/net/wireless/intel/iwlwifi/iwl-9000.c
index 5c1e71f..fbaf705 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-9000.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-9000.c
@@ -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