Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[cascardo/linux.git] / drivers / net / wireless / intel / iwlwifi / iwl-7000.c

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-7000.c b/drivers/net/wireless/intel/iwlwifi/iwl-7000.c
index 64690c1..d4b73de 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-7000.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-7000.c
@@ -73,13 +73,13 @@
 /* Highest firmware API version supported */
 #define IWL7260_UCODE_API_MAX  17
 #define IWL7265_UCODE_API_MAX  17
-#define IWL7265D_UCODE_API_MAX 24
-#define IWL3168_UCODE_API_MAX  24
+#define IWL7265D_UCODE_API_MAX 26
+#define IWL3168_UCODE_API_MAX  26
 
 /* Lowest firmware API version supported */
-#define IWL7260_UCODE_API_MIN  16
-#define IWL7265_UCODE_API_MIN  16
-#define IWL7265D_UCODE_API_MIN 16
+#define IWL7260_UCODE_API_MIN  17
+#define IWL7265_UCODE_API_MIN  17
+#define IWL7265D_UCODE_API_MIN 17
 #define IWL3168_UCODE_API_MIN  20
 
 /* NVM versions */