1 files changed, 63 insertions, 79 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
index a709d05c5868..2816b432c62f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
@@ -2,7 +2,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2010 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -222,13 +222,8 @@ void iwlagn_tx_queue_set_status(struct iwl_priv *priv,
                        scd_retry ? "BA" : "AC/CMD", txq_id, tx_fifo_id);
 }
 
-int iwlagn_txq_agg_enable(struct iwl_priv *priv, int txq_id,
-                          int tx_fifo, int sta_id, int tid, u16 ssn_idx)
+static int iwlagn_txq_agg_enable(struct iwl_priv *priv, int txq_id, int sta_id, int tid)
 {
-        unsigned long flags;
-        u16 ra_tid;
-        int ret;
-
         if ((IWLAGN_FIRST_AMPDU_QUEUE > txq_id) ||
             (IWLAGN_FIRST_AMPDU_QUEUE +
                 priv->cfg->base_params->num_of_ampdu_queues <= txq_id)) {
@@ -240,12 +235,33 @@ int iwlagn_txq_agg_enable(struct iwl_priv *priv, int txq_id,
                 return -EINVAL;
         }
 
-        ra_tid = BUILD_RAxTID(sta_id, tid);
-
         /* Modify device's station table to Tx this TID */
-        ret = iwl_sta_tx_modify_enable_tid(priv, sta_id, tid);
-        if (ret)
-                return ret;
+        return iwl_sta_tx_modify_enable_tid(priv, sta_id, tid);
+}
+
+void iwlagn_txq_agg_queue_setup(struct iwl_priv *priv,
+                                struct ieee80211_sta *sta,
+                                int tid, int frame_limit)
+{
+        int sta_id, tx_fifo, txq_id, ssn_idx;
+        u16 ra_tid;
+        unsigned long flags;
+        struct iwl_tid_data *tid_data;
+
+        sta_id = iwl_sta_id(sta);
+        if (WARN_ON(sta_id == IWL_INVALID_STATION))
+                return;
+        if (WARN_ON(tid >= MAX_TID_COUNT))
+                return;
+
+        spin_lock_irqsave(&priv->sta_lock, flags);
+        tid_data = &priv->stations[sta_id].tid[tid];
+        ssn_idx = SEQ_TO_SN(tid_data->seq_number);
+        txq_id = tid_data->agg.txq_id;
+        tx_fifo = tid_data->agg.tx_fifo;
+        spin_unlock_irqrestore(&priv->sta_lock, flags);
+
+        ra_tid = BUILD_RAxTID(sta_id, tid);
 
         spin_lock_irqsave(&priv->lock, flags);
 
@@ -271,10 +287,10 @@ int iwlagn_txq_agg_enable(struct iwl_priv *priv, int txq_id,
         iwl_write_targ_mem(priv, priv->scd_base_addr +
                         IWLAGN_SCD_CONTEXT_QUEUE_OFFSET(txq_id) +
                         sizeof(u32),
-                        ((SCD_WIN_SIZE <<
+                        ((frame_limit <<
                         IWLAGN_SCD_QUEUE_CTX_REG2_WIN_SIZE_POS) &
                         IWLAGN_SCD_QUEUE_CTX_REG2_WIN_SIZE_MSK) |
-                        ((SCD_FRAME_LIMIT <<
+                        ((frame_limit <<
                         IWLAGN_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_POS) &
                         IWLAGN_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK));
 
@@ -284,12 +300,10 @@ int iwlagn_txq_agg_enable(struct iwl_priv *priv, int txq_id,
         iwlagn_tx_queue_set_status(priv, &priv->txq[txq_id], tx_fifo, 1);
 
         spin_unlock_irqrestore(&priv->lock, flags);
-
-        return 0;
 }
 
-int iwlagn_txq_agg_disable(struct iwl_priv *priv, u16 txq_id,
-                           u16 ssn_idx, u8 tx_fifo)
+static int iwlagn_txq_agg_disable(struct iwl_priv *priv, u16 txq_id,
+                                  u16 ssn_idx, u8 tx_fifo)
 {
         if ((IWLAGN_FIRST_AMPDU_QUEUE > txq_id) ||
             (IWLAGN_FIRST_AMPDU_QUEUE +
@@ -1034,11 +1048,11 @@ int iwlagn_tx_agg_start(struct iwl_priv *priv, struct ieee80211_vif *vif,
         tid_data = &priv->stations[sta_id].tid[tid];
         *ssn = SEQ_TO_SN(tid_data->seq_number);
         tid_data->agg.txq_id = txq_id;
+        tid_data->agg.tx_fifo = tx_fifo;
         iwl_set_swq_id(&priv->txq[txq_id], get_ac_from_tid(tid), txq_id);
         spin_unlock_irqrestore(&priv->sta_lock, flags);
 
-        ret = priv->cfg->ops->lib->txq_agg_enable(priv, txq_id, tx_fifo,
-                                                  sta_id, tid, *ssn);
+        ret = iwlagn_txq_agg_enable(priv, txq_id, sta_id, tid);
         if (ret)
                 return ret;
 
@@ -1125,8 +1139,7 @@ int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif,
          * to deactivate the uCode queue, just return "success" to allow
          *  mac80211 to clean up it own data.
          */
-        priv->cfg->ops->lib->txq_agg_disable(priv, txq_id, ssn,
-                                                   tx_fifo_id);
+        iwlagn_txq_agg_disable(priv, txq_id, ssn, tx_fifo_id);
         spin_unlock_irqrestore(&priv->lock, flags);
 
         ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
@@ -1155,8 +1168,7 @@ int iwlagn_txq_check_empty(struct iwl_priv *priv,
                         u16 ssn = SEQ_TO_SN(tid_data->seq_number);
                         int tx_fifo = get_fifo_from_tid(ctx, tid);
                         IWL_DEBUG_HT(priv, "HW queue empty: continue DELBA flow\n");
-                        priv->cfg->ops->lib->txq_agg_disable(priv, txq_id,
-                                                             ssn, tx_fifo);
+                        iwlagn_txq_agg_disable(priv, txq_id, ssn, tx_fifo);
                         tid_data->agg.state = IWL_AGG_OFF;
                         ieee80211_stop_tx_ba_cb_irqsafe(ctx->vif, addr, tid);
                 }
@@ -1251,11 +1263,11 @@ static int iwlagn_tx_status_reply_compressed_ba(struct iwl_priv *priv,
                                  struct iwl_compressed_ba_resp *ba_resp)
 
 {
-        int i, sh, ack;
+        int sh;
         u16 seq_ctl = le16_to_cpu(ba_resp->seq_ctl);
         u16 scd_flow = le16_to_cpu(ba_resp->scd_flow);
-        int successes = 0;
         struct ieee80211_tx_info *info;
+        u64 bitmap, sent_bitmap;
 
         if (unlikely(!agg->wait_for_ba))  {
                 if (unlikely(ba_resp->bitmap))
@@ -1269,70 +1281,42 @@ static int iwlagn_tx_status_reply_compressed_ba(struct iwl_priv *priv,
 
         /* Calculate shift to align block-ack bits with our Tx window bits */
         sh = agg->start_idx - SEQ_TO_INDEX(seq_ctl >> 4);
-        if (sh < 0) /* tbw something is wrong with indices */
+        if (sh < 0)
                 sh += 0x100;
 
-        if (agg->frame_count > (64 - sh)) {
-                IWL_DEBUG_TX_REPLY(priv, "more frames than bitmap size");
-                return -1;
-        }
-        if (!priv->cfg->base_params->no_agg_framecnt_info && ba_resp->txed) {
+        /*
+         * Check for success or failure according to the
+         * transmitted bitmap and block-ack bitmap
+         */
+        bitmap = le64_to_cpu(ba_resp->bitmap) >> sh;
+        sent_bitmap = bitmap & agg->bitmap;
+
+        /* Sanity check values reported by uCode */
+        if (ba_resp->txed_2_done > ba_resp->txed) {
+                IWL_DEBUG_TX_REPLY(priv,
+                        "bogus sent(%d) and ack(%d) count\n",
+                        ba_resp->txed, ba_resp->txed_2_done);
                 /*
-                 * sent and ack information provided by uCode
-                 * use it instead of figure out ourself
+                 * set txed_2_done = txed,
+                 * so it won't impact rate scale
                  */
-                if (ba_resp->txed_2_done > ba_resp->txed) {
-                        IWL_DEBUG_TX_REPLY(priv,
-                                "bogus sent(%d) and ack(%d) count\n",
-                                ba_resp->txed, ba_resp->txed_2_done);
-                        /*
-                         * set txed_2_done = txed,
-                         * so it won't impact rate scale
-                         */
-                        ba_resp->txed = ba_resp->txed_2_done;
-                }
-                IWL_DEBUG_HT(priv, "agg frames sent:%d, acked:%d\n",
-                                ba_resp->txed, ba_resp->txed_2_done);
-        } else {
-                u64 bitmap, sent_bitmap;
-
-                /* don't use 64-bit values for now */
-                bitmap = le64_to_cpu(ba_resp->bitmap) >> sh;
-
-                /* check for success or failure according to the
-                 * transmitted bitmap and block-ack bitmap */
-                sent_bitmap = bitmap & agg->bitmap;
-
-                /* For each frame attempted in aggregation,
-                 * update driver's record of tx frame's status. */
-                i = 0;
-                while (sent_bitmap) {
-                        ack = sent_bitmap & 1ULL;
-                        successes += ack;
-                        IWL_DEBUG_TX_REPLY(priv, "%s ON i=%d idx=%d raw=%d\n",
-                                ack ? "ACK" : "NACK", i,
-                                (agg->start_idx + i) & 0xff,
-                                agg->start_idx + i);
-                        sent_bitmap >>= 1;
-                        ++i;
-                }
+                ba_resp->txed = ba_resp->txed_2_done;
+        }
+        IWL_DEBUG_HT(priv, "agg frames sent:%d, acked:%d\n",
+                        ba_resp->txed, ba_resp->txed_2_done);
 
-                IWL_DEBUG_TX_REPLY(priv, "Bitmap %llx\n",
-                                   (unsigned long long)bitmap);
+        /* Find the first ACKed frame to store the TX status */
+        while (sent_bitmap && !(sent_bitmap & 1)) {
+                agg->start_idx = (agg->start_idx + 1) & 0xff;
+                sent_bitmap >>= 1;
         }
 
         info = IEEE80211_SKB_CB(priv->txq[scd_flow].txb[agg->start_idx].skb);
         memset(&info->status, 0, sizeof(info->status));
         info->flags |= IEEE80211_TX_STAT_ACK;
         info->flags |= IEEE80211_TX_STAT_AMPDU;
-        if (!priv->cfg->base_params->no_agg_framecnt_info && ba_resp->txed) {
-                info->status.ampdu_ack_len = ba_resp->txed_2_done;
-                info->status.ampdu_len = ba_resp->txed;
-
-        } else {
-                info->status.ampdu_ack_len = successes;
-                info->status.ampdu_len = agg->frame_count;
-        }
+        info->status.ampdu_ack_len = ba_resp->txed_2_done;
+        info->status.ampdu_len = ba_resp->txed;
         iwlagn_hwrate_to_tx_control(priv, agg->rate_n_flags, info);
 
         return 0;