|
 |
1cbc899 |
From 1f16ea294d2ef63013740f4c8539e430b6c12dff Mon Sep 17 00:00:00 2001
|
|
|
1cbc899 |
From: Johannes Berg <johannes.berg@intel.com>
|
|
|
1cbc899 |
Date: Fri, 6 Mar 2015 09:17:37 +0100
|
|
|
1cbc899 |
Subject: [PATCH] iwlwifi: mvm: remove WARN_ON for invalid BA notification
|
|
|
1cbc899 |
|
|
|
1cbc899 |
The firmware frequently manages to trigger this, and there's
|
|
|
1cbc899 |
no known driver workaround, so stop warning.
|
|
|
1cbc899 |
|
|
|
1cbc899 |
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
|
1cbc899 |
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
|
|
|
1cbc899 |
---
|
|
|
1cbc899 |
drivers/net/wireless/iwlwifi/mvm/tx.c | 6 ++++--
|
|
|
1cbc899 |
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
1cbc899 |
|
|
|
1cbc899 |
diff --git a/drivers/net/wireless/iwlwifi/mvm/tx.c b/drivers/net/wireless/iwlwifi/mvm/tx.c
|
|
|
1cbc899 |
index 07304e1..96a0540 100644
|
|
|
1cbc899 |
--- a/drivers/net/wireless/iwlwifi/mvm/tx.c
|
|
|
1cbc899 |
+++ b/drivers/net/wireless/iwlwifi/mvm/tx.c
|
|
|
1cbc899 |
@@ -949,8 +949,10 @@ int iwl_mvm_rx_ba_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,
|
|
|
1cbc899 |
mvmsta = iwl_mvm_sta_from_mac80211(sta);
|
|
|
1cbc899 |
tid_data = &mvmsta->tid_data[tid];
|
|
|
1cbc899 |
|
|
|
1cbc899 |
- if (WARN_ONCE(tid_data->txq_id != scd_flow, "Q %d, tid %d, flow %d",
|
|
|
1cbc899 |
- tid_data->txq_id, tid, scd_flow)) {
|
|
|
1cbc899 |
+ if (tid_data->txq_id != scd_flow) {
|
|
|
1cbc899 |
+ IWL_ERR(mvm,
|
|
|
1cbc899 |
+ "invalid BA notification: Q %d, tid %d, flow %d\n",
|
|
|
1cbc899 |
+ tid_data->txq_id, tid, scd_flow);
|
|
|
1cbc899 |
rcu_read_unlock();
|
|
|
1cbc899 |
return 0;
|
|
|
1cbc899 |
}
|
|
|
1cbc899 |
--
|
|
|
1cbc899 |
2.1.0
|
|
|
1cbc899 |
|