iwlagn: priv->sta_lock moves to iwl_shared

Since it is used by all the layers, it needs to move to iwl_shared.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 25 insertions, 25 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
index c99e6cce0733..4b13bb9df999 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
@@ -116,9 +116,9 @@ int iwlagn_add_bssid_station(struct iwl_priv *priv, struct iwl_rxon_context *ctx
         if (sta_id_r)
                 *sta_id_r = sta_id;
 
-        spin_lock_irqsave(&priv->sta_lock, flags);
+        spin_lock_irqsave(&priv->shrd->sta_lock, flags);
         priv->stations[sta_id].used |= IWL_STA_LOCAL;
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
+        spin_unlock_irqrestore(&priv->shrd->sta_lock, flags);
 
         /* Set up default rate scaling table in device's station table */
         link_cmd = iwl_sta_alloc_lq(priv, ctx, sta_id);
@@ -132,9 +132,9 @@ int iwlagn_add_bssid_station(struct iwl_priv *priv, struct iwl_rxon_context *ctx
         if (ret)
                 IWL_ERR(priv, "Link quality command failed (%d)\n", ret);
 
-        spin_lock_irqsave(&priv->sta_lock, flags);
+        spin_lock_irqsave(&priv->shrd->sta_lock, flags);
         priv->stations[sta_id].lq = link_cmd;
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
+        spin_unlock_irqrestore(&priv->shrd->sta_lock, flags);
 
         return 0;
 }
@@ -311,9 +311,9 @@ static int iwlagn_send_sta_key(struct iwl_priv *priv,
         struct iwl_addsta_cmd sta_cmd;
         int i;
 
-        spin_lock_irqsave(&priv->sta_lock, flags);
+        spin_lock_irqsave(&priv->shrd->sta_lock, flags);
         memcpy(&sta_cmd, &priv->stations[sta_id].sta, sizeof(sta_cmd));
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
+        spin_unlock_irqrestore(&priv->shrd->sta_lock, flags);
 
         key_flags = cpu_to_le16(keyconf->keyidx << STA_KEY_FLG_KEYID_POS);
         key_flags |= STA_KEY_FLG_MAP_KEY_MSK;
@@ -388,11 +388,11 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv,
         if (sta_id == IWL_INVALID_STATION)
                 return -ENOENT;
 
-        spin_lock_irqsave(&priv->sta_lock, flags);
+        spin_lock_irqsave(&priv->shrd->sta_lock, flags);
         memcpy(&sta_cmd, &priv->stations[sta_id].sta, sizeof(sta_cmd));
         if (!(priv->stations[sta_id].used & IWL_STA_UCODE_ACTIVE))
                 sta_id = IWL_INVALID_STATION;
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
+        spin_unlock_irqrestore(&priv->shrd->sta_lock, flags);
 
         if (sta_id == IWL_INVALID_STATION)
                 return 0;
@@ -493,18 +493,18 @@ int iwlagn_alloc_bcast_station(struct iwl_priv *priv,
         unsigned long flags;
         u8 sta_id;
 
-        spin_lock_irqsave(&priv->sta_lock, flags);
+        spin_lock_irqsave(&priv->shrd->sta_lock, flags);
         sta_id = iwl_prep_station(priv, ctx, iwl_bcast_addr, false, NULL);
         if (sta_id == IWL_INVALID_STATION) {
                 IWL_ERR(priv, "Unable to prepare broadcast station\n");
-                spin_unlock_irqrestore(&priv->sta_lock, flags);
+                spin_unlock_irqrestore(&priv->shrd->sta_lock, flags);
 
                 return -EINVAL;
         }
 
         priv->stations[sta_id].used |= IWL_STA_DRIVER_ACTIVE;
         priv->stations[sta_id].used |= IWL_STA_BCAST;
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
+        spin_unlock_irqrestore(&priv->shrd->sta_lock, flags);
 
         link_cmd = iwl_sta_alloc_lq(priv, ctx, sta_id);
         if (!link_cmd) {
@@ -513,9 +513,9 @@ int iwlagn_alloc_bcast_station(struct iwl_priv *priv,
                 return -ENOMEM;
         }
 
-        spin_lock_irqsave(&priv->sta_lock, flags);
+        spin_lock_irqsave(&priv->shrd->sta_lock, flags);
         priv->stations[sta_id].lq = link_cmd;
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
+        spin_unlock_irqrestore(&priv->shrd->sta_lock, flags);
 
         return 0;
 }
@@ -539,13 +539,13 @@ int iwl_update_bcast_station(struct iwl_priv *priv,
                 return -ENOMEM;
         }
 
-        spin_lock_irqsave(&priv->sta_lock, flags);
+        spin_lock_irqsave(&priv->shrd->sta_lock, flags);
         if (priv->stations[sta_id].lq)
                 kfree(priv->stations[sta_id].lq);
         else
                 IWL_DEBUG_INFO(priv, "Bcast station rate scaling has not been initialized yet.\n");
         priv->stations[sta_id].lq = link_cmd;
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
+        spin_unlock_irqrestore(&priv->shrd->sta_lock, flags);
 
         return 0;
 }
@@ -575,12 +575,12 @@ int iwl_sta_tx_modify_enable_tid(struct iwl_priv *priv, int sta_id, int tid)
         lockdep_assert_held(&priv->shrd->mutex);
 
         /* Remove "disable" flag, to enable Tx for this TID */
-        spin_lock_irqsave(&priv->sta_lock, flags);
+        spin_lock_irqsave(&priv->shrd->sta_lock, flags);
         priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_TID_DISABLE_TX;
         priv->stations[sta_id].sta.tid_disable_tx &= cpu_to_le16(~(1 << tid));
         priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
         memcpy(&sta_cmd, &priv->stations[sta_id].sta, sizeof(struct iwl_addsta_cmd));
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
+        spin_unlock_irqrestore(&priv->shrd->sta_lock, flags);
 
         return iwl_send_add_sta(priv, &sta_cmd, CMD_SYNC);
 }
@@ -598,14 +598,14 @@ int iwl_sta_rx_agg_start(struct iwl_priv *priv, struct ieee80211_sta *sta,
         if (sta_id == IWL_INVALID_STATION)
                 return -ENXIO;
 
-        spin_lock_irqsave(&priv->sta_lock, flags);
+        spin_lock_irqsave(&priv->shrd->sta_lock, flags);
         priv->stations[sta_id].sta.station_flags_msk = 0;
         priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_ADDBA_TID_MSK;
         priv->stations[sta_id].sta.add_immediate_ba_tid = (u8)tid;
         priv->stations[sta_id].sta.add_immediate_ba_ssn = cpu_to_le16(ssn);
         priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
         memcpy(&sta_cmd, &priv->stations[sta_id].sta, sizeof(struct iwl_addsta_cmd));
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
+        spin_unlock_irqrestore(&priv->shrd->sta_lock, flags);
 
         return iwl_send_add_sta(priv, &sta_cmd, CMD_SYNC);
 }
@@ -625,13 +625,13 @@ int iwl_sta_rx_agg_stop(struct iwl_priv *priv, struct ieee80211_sta *sta,
                 return -ENXIO;
         }
 
-        spin_lock_irqsave(&priv->sta_lock, flags);
+        spin_lock_irqsave(&priv->shrd->sta_lock, flags);
         priv->stations[sta_id].sta.station_flags_msk = 0;
         priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_DELBA_TID_MSK;
         priv->stations[sta_id].sta.remove_immediate_ba_tid = (u8)tid;
         priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
         memcpy(&sta_cmd, &priv->stations[sta_id].sta, sizeof(struct iwl_addsta_cmd));
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
+        spin_unlock_irqrestore(&priv->shrd->sta_lock, flags);
 
         return iwl_send_add_sta(priv, &sta_cmd, CMD_SYNC);
 }
@@ -640,14 +640,14 @@ static void iwl_sta_modify_ps_wake(struct iwl_priv *priv, int sta_id)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&priv->sta_lock, flags);
+        spin_lock_irqsave(&priv->shrd->sta_lock, flags);
         priv->stations[sta_id].sta.station_flags &= ~STA_FLG_PWR_SAVE_MSK;
         priv->stations[sta_id].sta.station_flags_msk = STA_FLG_PWR_SAVE_MSK;
         priv->stations[sta_id].sta.sta.modify_mask = 0;
         priv->stations[sta_id].sta.sleep_tx_count = 0;
         priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
         iwl_send_add_sta(priv, &priv->stations[sta_id].sta, CMD_ASYNC);
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
+        spin_unlock_irqrestore(&priv->shrd->sta_lock, flags);
 
 }
 
@@ -655,7 +655,7 @@ void iwl_sta_modify_sleep_tx_count(struct iwl_priv *priv, int sta_id, int cnt)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&priv->sta_lock, flags);
+        spin_lock_irqsave(&priv->shrd->sta_lock, flags);
         priv->stations[sta_id].sta.station_flags |= STA_FLG_PWR_SAVE_MSK;
         priv->stations[sta_id].sta.station_flags_msk = STA_FLG_PWR_SAVE_MSK;
         priv->stations[sta_id].sta.sta.modify_mask =
@@ -663,7 +663,7 @@ void iwl_sta_modify_sleep_tx_count(struct iwl_priv *priv, int sta_id, int cnt)
         priv->stations[sta_id].sta.sleep_tx_count = cpu_to_le16(cnt);
         priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
         iwl_send_add_sta(priv, &priv->stations[sta_id].sta, CMD_ASYNC);
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
+        spin_unlock_irqrestore(&priv->shrd->sta_lock, flags);
 
 }