aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-lib.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-lib.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
index 7ace5078cc99..a604baa1383e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -778,7 +778,7 @@ int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
778 u8 scan_tx_antennas = hw_params(priv).valid_tx_ant; 778 u8 scan_tx_antennas = hw_params(priv).valid_tx_ant;
779 int ret; 779 int ret;
780 780
781 lockdep_assert_held(&priv->mutex); 781 lockdep_assert_held(&priv->shrd->mutex);
782 782
783 if (vif) 783 if (vif)
784 ctx = iwl_rxon_ctx_from_vif(vif); 784 ctx = iwl_rxon_ctx_from_vif(vif);
@@ -1165,7 +1165,7 @@ int iwlagn_txfifo_flush(struct iwl_priv *priv, u16 flush_control)
1165 1165
1166void iwlagn_dev_txfifo_flush(struct iwl_priv *priv, u16 flush_control) 1166void iwlagn_dev_txfifo_flush(struct iwl_priv *priv, u16 flush_control)
1167{ 1167{
1168 mutex_lock(&priv->mutex); 1168 mutex_lock(&priv->shrd->mutex);
1169 ieee80211_stop_queues(priv->hw); 1169 ieee80211_stop_queues(priv->hw);
1170 if (iwlagn_txfifo_flush(priv, IWL_DROP_ALL)) { 1170 if (iwlagn_txfifo_flush(priv, IWL_DROP_ALL)) {
1171 IWL_ERR(priv, "flush request fail\n"); 1171 IWL_ERR(priv, "flush request fail\n");
@@ -1175,7 +1175,7 @@ void iwlagn_dev_txfifo_flush(struct iwl_priv *priv, u16 flush_control)
1175 iwlagn_wait_tx_queue_empty(priv); 1175 iwlagn_wait_tx_queue_empty(priv);
1176done: 1176done:
1177 ieee80211_wake_queues(priv->hw); 1177 ieee80211_wake_queues(priv->hw);
1178 mutex_unlock(&priv->mutex); 1178 mutex_unlock(&priv->shrd->mutex);
1179} 1179}
1180 1180
1181/* 1181/*
@@ -1372,7 +1372,7 @@ void iwlagn_bt_adjust_rssi_monitor(struct iwl_priv *priv, bool rssi_ena)
1372 struct iwl_rxon_context *ctx, *found_ctx = NULL; 1372 struct iwl_rxon_context *ctx, *found_ctx = NULL;
1373 bool found_ap = false; 1373 bool found_ap = false;
1374 1374
1375 lockdep_assert_held(&priv->mutex); 1375 lockdep_assert_held(&priv->shrd->mutex);
1376 1376
1377 /* Check whether AP or GO mode is active. */ 1377 /* Check whether AP or GO mode is active. */
1378 if (rssi_ena) { 1378 if (rssi_ena) {
@@ -1485,7 +1485,7 @@ static void iwlagn_bt_traffic_change_work(struct work_struct *work)
1485 break; 1485 break;
1486 } 1486 }
1487 1487
1488 mutex_lock(&priv->mutex); 1488 mutex_lock(&priv->shrd->mutex);
1489 1489
1490 /* 1490 /*
1491 * We can not send command to firmware while scanning. When the scan 1491 * We can not send command to firmware while scanning. When the scan
@@ -1513,7 +1513,7 @@ static void iwlagn_bt_traffic_change_work(struct work_struct *work)
1513 */ 1513 */
1514 iwlagn_bt_coex_rssi_monitor(priv); 1514 iwlagn_bt_coex_rssi_monitor(priv);
1515out: 1515out:
1516 mutex_unlock(&priv->mutex); 1516 mutex_unlock(&priv->shrd->mutex);
1517} 1517}
1518 1518
1519/* 1519/*