diff options
| author |   Kalle Valo <kvalo@codeaurora.org> | 2015-11-17 15:51:56 +0200 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2015-11-17 15:51:56 +0200 |
| commit | 948cca9fc3052be86d937bcb74170215b38117e8 (patch) | |
| tree | 9ec9b57aad4eda0c18b6077c2fe9cfdd58b28bcc /drivers/net/wireless/iwlwifi/iwl-7000.c | |
| parent | ipg: Remove ipg driver (diff) | |
| parent | iwlwifi: mvm: Avoid dereferencing sta if it was already flushed (diff) | |
| download | linux-dev-948cca9fc3052be86d937bcb74170215b38117e8.tar.xz linux-dev-948cca9fc3052be86d937bcb74170215b38117e8.zip | |
Merge tag 'iwlwifi-for-kalle-2015-11-15' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
* bump API to firmware 19 - not released yet.
* fix D3 flows (Luca)
* new device IDs (Oren)
* fix NULL pointer dereference (Avri)
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-7000.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-7000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-7000.c b/drivers/net/wireless/iwlwifi/iwl-7000.c index 1a73c7a1da77..bf88ec3a65fa 100644 --- a/drivers/net/wireless/iwlwifi/iwl-7000.c +++ b/drivers/net/wireless/iwlwifi/iwl-7000.c @@ -69,7 +69,7 @@ #include "iwl-agn-hw.h" /* Highest firmware API version supported */ -#define IWL7260_UCODE_API_MAX 17 +#define IWL7260_UCODE_API_MAX 19 /* Oldest version we won't warn about */ #define IWL7260_UCODE_API_OK 13 |