GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-23 07:01:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

iwlwifi: mvm: fix inconsistent lock in dqa mode

Browse source 
When working in DQA mode, there is a lockdep log warning
about an inconsistent state of the mvmsta->lock and the
mvm->queue_info_lock. Fix this. This mode is not activated
for now.

Signed-off-by: Liad Kaufman <liad.kaufman@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
This commit is contained in:
Liad Kaufman 2016-03-23 16:31:08 +02:00 • committed by Emmanuel Grumbach
parent a6017b9030
commit d2515a99b2
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/net/wireless/intel/iwlwifi/mvm/sta.c
View file

@ -296,7 +296,7 @@ static int iwl_mvm_sta_alloc_queue(struct iwl_mvm *mvm,
lockdep_assert_held(&mvm->mutex); lockdep_assert_held(&mvm->mutex);
spin_lock(&mvm->queue_info_lock); spin_lock_bh(&mvm->queue_info_lock);
/* /*
* Non-QoS, QoS NDP and MGMT frames should go to a MGMT queue, if one * Non-QoS, QoS NDP and MGMT frames should go to a MGMT queue, if one
@ -324,7 +324,7 @@ static int iwl_mvm_sta_alloc_queue(struct iwl_mvm *mvm,
if (queue >= 0) if (queue >= 0)
mvm->queue_info[queue].setup_reserved = false; mvm->queue_info[queue].setup_reserved = false;
spin_unlock(&mvm->queue_info_lock); spin_unlock_bh(&mvm->queue_info_lock);
/* TODO: support shared queues for same RA */ /* TODO: support shared queues for same RA */
if (queue < 0) if (queue < 0)
@ -402,12 +402,12 @@ static void iwl_mvm_tx_deferred_stream(struct iwl_mvm *mvm,
__skb_queue_head_init(&deferred_tx); __skb_queue_head_init(&deferred_tx);
/* Disable bottom-halves when entering TX path */
local_bh_disable();
spin_lock(&mvmsta->lock); spin_lock(&mvmsta->lock);
skb_queue_splice_init(&tid_data->deferred_tx_frames, &deferred_tx); skb_queue_splice_init(&tid_data->deferred_tx_frames, &deferred_tx);
spin_unlock(&mvmsta->lock); spin_unlock(&mvmsta->lock);
/* Disable bottom-halves when entering TX path */
local_bh_disable();
while ((skb = __skb_dequeue(&deferred_tx))) while ((skb = __skb_dequeue(&deferred_tx)))
if (no_queue || iwl_mvm_tx_skb(mvm, skb, sta)) if (no_queue || iwl_mvm_tx_skb(mvm, skb, sta))
ieee80211_free_txskb(mvm->hw, skb); ieee80211_free_txskb(mvm->hw, skb);