diff options
| author | Reinette Chatre <reinette.chatre@intel.com> | 2008-03-07 13:47:20 -0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-03-07 17:25:26 -0500 |
| commit | deedf504302ff747985db081352e045ff7087a11 (patch) | |
| tree | 1b2e1c8717cef38dd56a00f8109d683ca3930e21 /drivers | |
| parent | f868f4e196177ee96f77304ab707a0ad5ddd6fe4 (diff) | |
iwlwifi: fix potential lock inversion deadlockmaster-2008-03-07
This is a change to a previous patch ("iwlwifi: 3945 split tx_complete
to command and packet function") to ensure we do not have hardirq safe
locks (priv->lock in this case) depend on hardirq unsafe locks.
We only call iwl3945_tx_queue_reclaim while in a tasklet so we have to use
the irqsafe version of the function.
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c index dc3d695bf09..50a641c0c5b 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c @@ -283,8 +283,8 @@ static void iwl3945_tx_queue_reclaim(struct iwl3945_priv *priv, q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd)) { tx_info = &txq->txb[txq->q.read_ptr]; - ieee80211_tx_status(priv->hw, tx_info->skb[0], - &tx_info->status); + ieee80211_tx_status_irqsafe(priv->hw, tx_info->skb[0], + &tx_info->status); tx_info->skb[0] = NULL; iwl3945_hw_txq_free_tfd(priv, txq); } |