aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2009-01-08 13:20:01 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-01-29 16:00:16 -0500
commitc7a7c8ecd43b4bc796a8e79c46305e2a677b55f3 (patch)
treedf8eb4244128280a1e5248e0a45b6e7229be8525
parenta8302de934b5d1897ff146cd0c7ab87d1417c092 (diff)
iwl3945: Fix iwl3945_init_drv()
iwl3945_init_drv() initialises the wrong lock, and sets the wrong power saving default level. With this power saving mode, we are losing a lot of frames in Ad-Hoc mode. This is a bug fix for bug #1873. ( http://www.intellinuxwireless.org/bugzilla/show_bug.cgi?id=1873 ) Signed-off-by: Samuel Ortiz <samuel.ortiz@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 76577b6bc9e..1b04284c4ca 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -7276,7 +7276,7 @@ static int iwl3945_init_drv(struct iwl_priv *priv)
7276 priv->ibss_beacon = NULL; 7276 priv->ibss_beacon = NULL;
7277 7277
7278 spin_lock_init(&priv->lock); 7278 spin_lock_init(&priv->lock);
7279 spin_lock_init(&priv->power_data.lock); 7279 spin_lock_init(&priv->power_data_39.lock);
7280 spin_lock_init(&priv->sta_lock); 7280 spin_lock_init(&priv->sta_lock);
7281 spin_lock_init(&priv->hcmd_lock); 7281 spin_lock_init(&priv->hcmd_lock);
7282 7282
@@ -7301,7 +7301,7 @@ static int iwl3945_init_drv(struct iwl_priv *priv)
7301 7301
7302 priv->rates_mask = IWL_RATES_MASK; 7302 priv->rates_mask = IWL_RATES_MASK;
7303 /* If power management is turned on, default to AC mode */ 7303 /* If power management is turned on, default to AC mode */
7304 priv->power_mode = IWL_POWER_AC; 7304 priv->power_mode = IWL39_POWER_AC;
7305 priv->user_txpower_limit = IWL_DEFAULT_TX_POWER; 7305 priv->user_txpower_limit = IWL_DEFAULT_TX_POWER;
7306 7306
7307 ret = iwl3945_init_channel_map(priv); 7307 ret = iwl3945_init_channel_map(priv);