Commit 6617942e authored by Bob Copeland's avatar Bob Copeland Committed by John W. Linville

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarBob Copeland <me@bobcopeland.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 80b08a8d
...@@ -1045,11 +1045,11 @@ ath5k_drain_tx_buffs(struct ath5k_hw *ah) ...@@ -1045,11 +1045,11 @@ ath5k_drain_tx_buffs(struct ath5k_hw *ah)
ath5k_txbuf_free_skb(ah, bf); ath5k_txbuf_free_skb(ah, bf);
spin_lock_bh(&ah->txbuflock); spin_lock(&ah->txbuflock);
list_move_tail(&bf->list, &ah->txbuf); list_move_tail(&bf->list, &ah->txbuf);
ah->txbuf_len++; ah->txbuf_len++;
txq->txq_len--; txq->txq_len--;
spin_unlock_bh(&ah->txbuflock); spin_unlock(&ah->txbuflock);
} }
txq->link = NULL; txq->link = NULL;
txq->txq_poll_mark = false; txq->txq_poll_mark = false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment