diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2011-08-26 02:10:43 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-08-29 15:25:31 -0400 |
commit | 10b15e6f67ba4d9abb8788100a5267341cc98b7b (patch) | |
tree | ca9f512e2d2d6c1311c65ad508cec1c169cd6987 /drivers/net/wireless/iwlwifi/iwl-5000.c | |
parent | 63013ae30159c90d2a873e20e680e7810fa533fa (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-5000.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-5000.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index e073422edab..feefb5b0987 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c | |||
@@ -69,7 +69,7 @@ static void iwl5000_nic_config(struct iwl_priv *priv) | |||
69 | 69 | ||
70 | iwl_rf_config(priv); | 70 | iwl_rf_config(priv); |
71 | 71 | ||
72 | spin_lock_irqsave(&priv->lock, flags); | 72 | spin_lock_irqsave(&priv->shrd->lock, flags); |
73 | 73 | ||
74 | /* W/A : NIC is stuck in a reset state after Early PCIe power off | 74 | /* W/A : NIC is stuck in a reset state after Early PCIe power off |
75 | * (PCIe power is lost before PERST# is asserted), | 75 | * (PCIe power is lost before PERST# is asserted), |
@@ -80,7 +80,7 @@ static void iwl5000_nic_config(struct iwl_priv *priv) | |||
80 | ~APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS); | 80 | ~APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS); |
81 | 81 | ||
82 | 82 | ||
83 | spin_unlock_irqrestore(&priv->lock, flags); | 83 | spin_unlock_irqrestore(&priv->shrd->lock, flags); |
84 | } | 84 | } |
85 | 85 | ||
86 | static struct iwl_sensitivity_ranges iwl5000_sensitivity = { | 86 | static struct iwl_sensitivity_ranges iwl5000_sensitivity = { |