iwlwifi: 802.11n comply HT add station flow with mac80211 framework

[powerpc.git] / drivers / net / wireless / iwlwifi / iwl-4965-rs.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
index 218c5a3..503b917 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
@@ -2023,8 +2023,8 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
                if (sta_id == IWL_INVALID_STATION) {
                        IWL_DEBUG_RATE("LQ: ADD station %s\n",
                                       print_mac(mac, hdr->addr1));
-                       sta_id = iwl4965_add_station_flags(priv,
-                                                hdr->addr1, 0, CMD_ASYNC);
+                       sta_id = iwl4965_add_station_flags(priv, hdr->addr1,
+                                                       0, CMD_ASYNC, NULL);
                }
                if ((sta_id != IWL_INVALID_STATION)) {
                        lq->lq.sta_id = sta_id;
@@ -2101,8 +2101,8 @@ static void rs_rate_init(void *priv_rate, void *priv_sta,
                if (sta_id == IWL_INVALID_STATION) {
                        IWL_DEBUG_RATE("LQ: ADD station %s\n",
                                       print_mac(mac, sta->addr));
-                       sta_id = iwl4965_add_station_flags(priv,
-                                                sta->addr, 0, CMD_ASYNC);
+                       sta_id = iwl4965_add_station_flags(priv, sta->addr,
+                                                       0, CMD_ASYNC, NULL);
                }
                if ((sta_id != IWL_INVALID_STATION)) {
                        crl->lq.sta_id = sta_id;
@@ -2123,7 +2123,7 @@ static void rs_rate_init(void *priv_rate, void *priv_sta,
        if (local->hw.conf.phymode == MODE_IEEE80211A)
                sta->last_txrate += IWL_FIRST_OFDM_RATE;
 
-       crl->is_dup = priv->is_dup;
+       crl->is_dup = 0;
        crl->valid_antenna = priv->valid_antenna;
        crl->antenna = priv->antenna;
        crl->is_green = rs_use_green(priv);