diff options
| author | David S. Miller <davem@davemloft.net> | 2015-11-22 20:40:22 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-11-22 20:40:22 -0500 |
| commit | f96c9285487f28a90b301718aad86f047d2abb94 (patch) | |
| tree | 0d490292a4ee09262cd10710314cd289498b1d67 /drivers/net/wireless/iwlwifi/iwl-8000.c | |
| parent | cf869eb1118fac333b26585bce61f862d0e2b3eb (diff) | |
| parent | eeec5d0ef7ee54a75e09e861c3cc44177b8752c7 (diff) | |
| download | lwn-f96c9285487f28a90b301718aad86f047d2abb94.tar.gz lwn-f96c9285487f28a90b301718aad86f047d2abb94.zip | |
Merge tag 'wireless-drivers-for-davem-2015-11-20' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers
Kalle Valo says:
====================
iwlwifi
* bump API to firmware 19 - not released yet.
* fix D3 flows (Luca)
* new device IDs (Oren)
* fix NULL pointer dereference (Avri)
ath10k
* fix invalid NSS for 4x4 devices
* add QCA9377 hw1.0 support
* fix QCA6174 regression with CE5 usage
wil6210
* new maintainer - Maya Erez
rtlwifi
* rtl8821ae: Fix lockups on boot
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-8000.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-8000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-8000.c b/drivers/net/wireless/iwlwifi/iwl-8000.c index 0116e5a4c393..9bcc0bf937d8 100644 --- a/drivers/net/wireless/iwlwifi/iwl-8000.c +++ b/drivers/net/wireless/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 |