diff options
| author | Kalle Valo | 2017-10-09 16:31:39 +0200 |
|---|---|---|
| committer | Kalle Valo | 2017-10-09 16:31:39 +0200 |
| commit | a6127b4440d1f74f26b64006b2f50c9dc6d66efc (patch) | |
| tree | 4a4fe25e07e97c4c0b8fb6807d573923e3404008 /drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | |
| parent | brcmsmac: make some local variables 'static const' to reduce stack size (diff) | |
| parent | iwlwifi: nvm: set the correct offsets to 3168 series (diff) | |
| download | kernel-qcow2-linux-a6127b4440d1f74f26b64006b2f50c9dc6d66efc.tar.gz kernel-qcow2-linux-a6127b4440d1f74f26b64006b2f50c9dc6d66efc.tar.xz kernel-qcow2-linux-a6127b4440d1f74f26b64006b2f50c9dc6d66efc.zip | |
Merge tag 'iwlwifi-for-kalle-2017-10-06' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
Second set of iwlwifi fixes for 4.14
* Fix support for 3168 device series;
* Fix a potential crash when using FW debugging recording;
* Improve channel flags parsing to avoid warnings on too long traces;
* Return -ENODATA when the temperature is not available, since the
-EIO we were returning was causing fatal errors in userspace;
* Avoid printing too many messages in dmesg when using monitor mode,
since this can become very noisy and completely flood the logs;
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c index 77f77bc5d083..248699c2c4bf 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c @@ -277,7 +277,9 @@ static int iwl_mvm_rx_crypto(struct iwl_mvm *mvm, struct ieee80211_hdr *hdr, stats->flag |= RX_FLAG_DECRYPTED; return 0; default: - IWL_ERR(mvm, "Unhandled alg: 0x%x\n", status); + /* Expected in monitor (not having the keys) */ + if (!mvm->monitor_on) + IWL_ERR(mvm, "Unhandled alg: 0x%x\n", status); } return 0; |