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>

diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 76577b6bc9efaa57e40607c66a01341688b741ba..1b04284c4ca8f19dfb47d7605647ded5f1863f5d 100644 (file)
--- 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)
        priv->ibss_beacon = NULL;
 
        spin_lock_init(&priv->lock);
-       spin_lock_init(&priv->power_data.lock);
+       spin_lock_init(&priv->power_data_39.lock);
        spin_lock_init(&priv->sta_lock);
        spin_lock_init(&priv->hcmd_lock);
 
@@ -7301,7 +7301,7 @@ static int iwl3945_init_drv(struct iwl_priv *priv)
 
        priv->rates_mask = IWL_RATES_MASK;
        /* If power management is turned on, default to AC mode */
-       priv->power_mode = IWL_POWER_AC;
+       priv->power_mode = IWL39_POWER_AC;
        priv->user_txpower_limit = IWL_DEFAULT_TX_POWER;
 
        ret = iwl3945_init_channel_map(priv);