[PATCH] iwlwifi: fix add_station to avoid FW error

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / iwlwifi / iwl3945-base.c

diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index dacf55ba0b7b6b99f2ef33e16374ab27caa9051b..d153ca5f95735c132d13e7454370722fd37da818 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -464,6 +464,7 @@ u8 iwl_add_station(struct iwl_priv *priv, const u8 *addr, int is_ap, u8 flags)
        struct iwl_station_entry *station;
        unsigned long flags_spin;
        DECLARE_MAC_BUF(mac);
+       u8 rate;
 
        spin_lock_irqsave(&priv->sta_lock, flags_spin);
        if (is_ap)
@@ -507,6 +508,15 @@ u8 iwl_add_station(struct iwl_priv *priv, const u8 *addr, int is_ap, u8 flags)
        station->sta.sta.sta_id = index;
        station->sta.station_flags = 0;
 
+       rate = (priv->phymode == MODE_IEEE80211A) ? IWL_RATE_6M_PLCP :
+                               IWL_RATE_1M_PLCP | priv->hw_setting.cck_flag;
+
+       /* Turn on both antennas for the station... */
+       station->sta.rate_n_flags =
+                       iwl_hw_set_rate_n_flags(rate, RATE_MCS_ANT_AB_MSK);
+       station->current_rate.rate_n_flags =
+                       le16_to_cpu(station->sta.rate_n_flags);
+
        spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
        iwl_send_add_station(priv, &station->sta, flags);
        return index;