diff options
| author | David S. Miller <davem@davemloft.net> | 2016-06-23 22:22:31 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-23 22:22:31 +0300 |
| commit | 00e8cb00bc72f5279fde9d014b47f36dc4805dd8 (patch) | |
| tree | c657c431dd615522ab1377028874393004c6fe52 /drivers/net/wireless/intel/iwlwifi/mvm/scan.c | |
| parent | efeb2267bba8aa893afdadfc9bae4790777c600c (diff) | |
| parent | 034fdd4a17ff089c2428ece18efa65c5396810d2 (diff) | |
| download | linux-00e8cb00bc72f5279fde9d014b47f36dc4805dd8.tar.xz | |
Merge tag 'wireless-drivers-for-davem-2016-06-21' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers
Kalle Valo says:
====================
wireless-drivers fixes for 4.7
iwlwifi
* fix the scan timeout for long scans
* fix an RCU splat caused when updating the TKIP key
* fix a potential NULL-derefence introduced recently
* fix a IGTK key bug that has existed since the MVM driver was introduced
* fix some fw capabilities checks that got accidentally inverted
rtl8xxxu
* fix typo on variable name
ath10k
* fix deadlock when peer cannot be created
* fix crash related to printing features
* fix deadlock while processing rx_in_ord_ind
ath9k
* fix GPIO mask regression for AR9462 and AR9565
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/scan.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c index 6f609dd5c222..e78fc567ff7d 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c @@ -1222,7 +1222,7 @@ static int iwl_mvm_check_running_scans(struct iwl_mvm *mvm, int type) return -EIO; } -#define SCAN_TIMEOUT (16 * HZ) +#define SCAN_TIMEOUT (20 * HZ) void iwl_mvm_scan_timeout(unsigned long data) { |