diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2016-01-07 23:04:07 +0200 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2016-01-07 23:04:07 +0200 |
| commit | aa8a7219d75a0bcbdfcf5c2b8b26573936baf369 (patch) | |
| tree | 02c610c5284fdb559ae07466aadb6409e2c292f7 /drivers/net/wireless/intel/iwlwifi/iwl-9000.c | |
| parent | 236c52cac41a9168525bf7c22accdd12f8069a35 (diff) | |
| parent | 62d7476d958ce06d7a10b02bdb30006870286fe2 (diff) | |
Merge tag 'iwlwifi-next-for-kalle-2016-01-07_2' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
* bug fixes and improvements for firmware debug system (Golan and myself)
* fixes for D0i3 (Eliad)
* prevent muliple stations with the same MAC address
* advertise support for Rx A-MSDU in A-MPDU
* scan related fixes
* support -20.ucode
* fix WoWLAN for iwldvm
* preparations towards multiple Rx queues
* platform power improvements for GO mode when no clients are associated
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/iwl-9000.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-9000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-9000.c b/drivers/net/wireless/intel/iwlwifi/iwl-9000.c index 0d2aa1d9a50f..ecbf4822cd69 100644 --- 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 16 +#define IWL9000_UCODE_API_MAX 20 /* Oldest version we won't warn about */ #define IWL9000_UCODE_API_OK 13 |