Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6

1 files changed, 50 insertions, 27 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
index 1205cecfcaf0..07bbc915529a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
@@ -518,7 +518,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
         struct iwl_cmd_meta *out_meta;
         struct iwl_tx_cmd *tx_cmd;
         struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-        int swq_id, txq_id;
+        int txq_id;
         dma_addr_t phys_addr;
         dma_addr_t txcmd_phys;
         dma_addr_t scratch_phys;
@@ -620,7 +620,6 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
         }
 
         txq = &priv->txq[txq_id];
-        swq_id = txq->swq_id;
         q = &txq->q;
 
         if (unlikely(iwl_queue_space(q) < q->high_mark)) {
@@ -775,7 +774,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
                         iwl_txq_update_write_ptr(priv, txq);
                         spin_unlock_irqrestore(&priv->lock, flags);
                 } else {
-                        iwl_stop_queue(priv, txq->swq_id);
+                        iwl_stop_queue(priv, txq);
                 }
         }
 
@@ -1004,7 +1003,7 @@ 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;
-        priv->txq[txq_id].swq_id = iwl_virtual_agg_queue_num(get_ac_from_tid(tid), txq_id);
+        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,
@@ -1232,37 +1231,61 @@ static int iwlagn_tx_status_reply_compressed_ba(struct iwl_priv *priv,
         if (sh < 0) /* tbw something is wrong with indices */
                 sh += 0x100;
 
-        /* don't use 64-bit values for now */
-        bitmap = le64_to_cpu(ba_resp->bitmap) >> sh;
-
         if (agg->frame_count > (64 - sh)) {
                 IWL_DEBUG_TX_REPLY(priv, "more frames than bitmap size");
                 return -1;
         }
-
-        /* 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;
+        if (!priv->cfg->base_params->no_agg_framecnt_info && ba_resp->txed) {
+                /*
+                 * sent and ack information provided by uCode
+                 * use it instead of figure out ourself
+                 */
+                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 {
+                /* 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;
+                }
         }
-
         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;
-        info->status.ampdu_ack_len = successes;
-        info->status.ampdu_len = agg->frame_count;
+        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;
+        }
         iwlagn_hwrate_to_tx_control(priv, agg->rate_n_flags, info);
 
         IWL_DEBUG_TX_REPLY(priv, "Bitmap %llx\n", (unsigned long long)bitmap);
@@ -1376,7 +1399,7 @@ void iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,
                 if ((iwl_queue_space(&txq->q) > txq->q.low_mark) &&
                     priv->mac80211_registered &&
                     (agg->state != IWL_EMPTYING_HW_QUEUE_DELBA))
-                        iwl_wake_queue(priv, txq->swq_id);
+                        iwl_wake_queue(priv, txq);
 
                 iwlagn_txq_check_empty(priv, sta_id, tid, scd_flow);
         }