iwlwifi: A-MPDU Tx conform block Ack rate scaling to mac80211

This patch uses the changes in ieee80211_tx_status to pass Block Ack data
to rate scaling module, and uses this data in rate scaling calculations

Signed-off-by: Ron Rindjunsky <ron.rindjunsky@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index b315a099d1a0..89aff4aae45f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -4286,12 +4286,9 @@ static int iwl4965_tx_status_reply_compressed_ba(struct iwl4965_priv *priv,
 
         tx_status = &priv->txq[scd_flow].txb[agg->start_idx].status;
         tx_status->flags = IEEE80211_TX_STATUS_ACK;
-        tx_status->retry_count++;
-#ifdef CONFIG_IWL4965_HT_AGG
-        tx_status->flags |= IEEE80211_TX_STATUS_AGG_STATS;
-        tx_status->successes = successes;
-        tx_status->frame_count = agg->frame_count;
-#endif  /* CONFIG_IWL4965_HT_AGG */
+        tx_status->flags |= IEEE80211_TX_STATUS_AMPDU;
+        tx_status->ampdu_ack_map = successes;
+        tx_status->ampdu_ack_len = agg->frame_count;
         tx_status->control.tx_rate = agg->rate_n_flags;
 
         IWL_DEBUG_TX_REPLY("Bitmap %llx\n", bitmap);