diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-11-26 15:38:24 +0100 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-11-26 15:38:24 +0100 |
| commit | 4615fd1551334ae5ce8e118a58d697d61f1c7d58 (patch) | |
| tree | 0fb1d9978e9b594b648e4e21c2461b523955b0a1 /drivers/net/wireless/intel/iwlwifi/iwl-8000.c | |
| parent | mac80211_hwsim: move Kconfig entry for sorting alphabetically (diff) | |
| parent | iwlwifi: mvm: Avoid dereferencing sta if it was already flushed (diff) | |
| download | linux-4615fd1551334ae5ce8e118a58d697d61f1c7d58.tar.xz linux-4615fd1551334ae5ce8e118a58d697d61f1c7d58.zip | |
Merge remote-tracking branch 'iwlwifi-fixes/master' into next
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/iwl-8000.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-8000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c index 0116e5a4c393..9bcc0bf937d8 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c @@ -69,7 +69,7 @@ #include "iwl-agn-hw.h" /* Highest firmware API version supported */ -#define IWL8000_UCODE_API_MAX 17 +#define IWL8000_UCODE_API_MAX 19 /* Oldest version we won't warn about */ #define IWL8000_UCODE_API_OK 13 |