Skip to contentSkip to conversation

ath5k: remove _bh from inner locks

PATCH New Bob Copeland 1 participant 1 message Jun 15, 2012 Atheros ATH5K wireless driver

lore
Share & tools
lore

Bob Copeland

author
#0 lore raw

PATCH 1/1 ath5k: remove _bh from inner locks

spin_unlock_bh(&txq->lock) already disables softirqs so we don't want to do it here. Fixes smatch warnings:

drivers/net/wireless/ath/ath5k/base.c:1048 ath5k_drain_tx_buffs() error: double lock 'bottom_half:' drivers/net/wireless/ath/ath5k/base.c:1056 ath5k_drain_tx_buffs() error: double unlock 'bottom_half:'

Reported-by Johannes Berg <[email protected]>
Signed-off-by Bob Copeland <[email protected]>
---
 drivers/net/wireless/ath/ath5k/base.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath5k/base.c +2 -2
index fbaa309..44ad6fe 100644
@@ -1045,11 +1045,11 @@ ath5k_drain_tx_buffs(struct ath5k_hw *ah)
 
 				ath5k_txbuf_free_skb(ah, bf);
 
-				spin_lock_bh(&ah->txbuflock);
+				spin_lock(&ah->txbuflock);
 				list_move_tail(&bf->list, &ah->txbuf);
 				ah->txbuf_len++;
 				txq->txq_len--;
-				spin_unlock_bh(&ah->txbuflock);
+				spin_unlock(&ah->txbuflock);
 			}
 			txq->link = NULL;
 			txq->txq_poll_mark = false;
Signature · 4 lines
1.7.2.5

-- 
Bob Copeland %% www.bobcopeland.com