44 lines
1.5 KiB
Diff
44 lines
1.5 KiB
Diff
From: Johannes Berg <johannes.berg@intel.com>
|
|
Date: Thu, 13 Jun 2013 16:06:08 +0200
|
|
Subject: iwlwifi: bump required firmware API version for 3160/7260
|
|
Origin: https://git.kernel.org/linus/a2d0909a687b4d250cc2b7481072e361678745ba
|
|
|
|
As the firmware API has changed significantly and we don't
|
|
have support code for the old APIs, bump the version to be
|
|
able to release the version 7 API firmware. Unfortunately
|
|
this means that the driver in 3.9 and 3.10 can't work, but
|
|
that's still better than crashing the device/driver there.
|
|
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
---
|
|
drivers/net/wireless/iwlwifi/iwl-7000.c | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/iwlwifi/iwl-7000.c b/drivers/net/wireless/iwlwifi/iwl-7000.c
|
|
index d4f3b48..22b7fa5 100644
|
|
--- a/drivers/net/wireless/iwlwifi/iwl-7000.c
|
|
+++ b/drivers/net/wireless/iwlwifi/iwl-7000.c
|
|
@@ -67,16 +67,16 @@
|
|
#include "iwl-agn-hw.h"
|
|
|
|
/* Highest firmware API version supported */
|
|
-#define IWL7260_UCODE_API_MAX 6
|
|
-#define IWL3160_UCODE_API_MAX 6
|
|
+#define IWL7260_UCODE_API_MAX 7
|
|
+#define IWL3160_UCODE_API_MAX 7
|
|
|
|
/* Oldest version we won't warn about */
|
|
-#define IWL7260_UCODE_API_OK 6
|
|
-#define IWL3160_UCODE_API_OK 6
|
|
+#define IWL7260_UCODE_API_OK 7
|
|
+#define IWL3160_UCODE_API_OK 7
|
|
|
|
/* Lowest firmware API version supported */
|
|
-#define IWL7260_UCODE_API_MIN 6
|
|
-#define IWL3160_UCODE_API_MIN 6
|
|
+#define IWL7260_UCODE_API_MIN 7
|
|
+#define IWL3160_UCODE_API_MIN 7
|
|
|
|
/* NVM versions */
|
|
#define IWL7260_NVM_VERSION 0x0a1d
|