aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-core.c
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2011-08-26 02:10:43 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-08-29 15:25:31 -0400
commit10b15e6f67ba4d9abb8788100a5267341cc98b7b (patch)
treeca9f512e2d2d6c1311c65ad508cec1c169cd6987 /drivers/net/wireless/iwlwifi/iwl-core.c
parent63013ae30159c90d2a873e20e680e7810fa533fa (diff)
iwlagn: priv->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>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-core.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index a5a694daddde..40ad889264a9 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -1186,7 +1186,7 @@ int iwl_mac_conf_tx(struct ieee80211_hw *hw, u16 queue,
1186 1186
1187 q = AC_NUM - 1 - queue; 1187 q = AC_NUM - 1 - queue;
1188 1188
1189 spin_lock_irqsave(&priv->lock, flags); 1189 spin_lock_irqsave(&priv->shrd->lock, flags);
1190 1190
1191 /* 1191 /*
1192 * MULTI-FIXME 1192 * MULTI-FIXME
@@ -1204,7 +1204,7 @@ int iwl_mac_conf_tx(struct ieee80211_hw *hw, u16 queue,
1204 ctx->qos_data.def_qos_parm.ac[q].reserved1 = 0; 1204 ctx->qos_data.def_qos_parm.ac[q].reserved1 = 0;
1205 } 1205 }
1206 1206
1207 spin_unlock_irqrestore(&priv->lock, flags); 1207 spin_unlock_irqrestore(&priv->shrd->lock, flags);
1208 1208
1209 IWL_DEBUG_MAC80211(priv, "leave\n"); 1209 IWL_DEBUG_MAC80211(priv, "leave\n");
1210 return 0; 1210 return 0;