Attachment 670702 Details for Bug 863424 – better fix

[patch] better fix

0001-iwlwifi-fix-the-reclaimed-packet-tracking-upon-flush.patch (text/plain), 1.99 KB, created by Emmanuel Grumbach on 2012-12-31 08:07:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Emmanuel Grumbach

Created: 2012-12-31 08:07:11 UTC

Size: 1.99 KB

patch

obsolete

>From 2c1039e5fe0f4cbc6f66e60a2bcd5247b79be22b Mon Sep 17 00:00:00 2001
>From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
>Date: Mon, 31 Dec 2012 09:26:10 +0200
>Subject: [PATCH 1/1] iwlwifi: fix the reclaimed packet tracking upon flush queue
>
>The FW is buggy and the sequence control in the Tx response
>isn't updated - take it from the packet itself.
>
>Change-Id: I3fd71dc7c6f8fd8b385141c4bb63fa6bccab90b7
>Cc: stable@vger.kernel.org
>Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
>---
> drivers/net/wireless/iwlwifi/dvm/tx.c |   22 +++++++++++++++-------
> 1 files changed, 15 insertions(+), 7 deletions(-)
>
>diff --git a/drivers/net/wireless/iwlwifi/dvm/tx.c b/drivers/net/wireless/iwlwifi/dvm/tx.c
>index d1f54cd..6653c13 100644
>--- a/drivers/net/wireless/iwlwifi/dvm/tx.c
>+++ b/drivers/net/wireless/iwlwifi/dvm/tx.c
>@@ -1162,13 +1162,6 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb,
> 			next_reclaimed = ssn;
> 		}
> 
>-		if (tid != IWL_TID_NON_QOS) {
>-			priv->tid_data[sta_id][tid].next_reclaimed =
>-				next_reclaimed;
>-			IWL_DEBUG_TX_REPLY(priv, "Next reclaimed packet:%d\n",
>-						  next_reclaimed);
>-		}
>-
> 		iwl_trans_reclaim(priv->trans, txq_id, ssn, &skbs);
> 
> 		iwlagn_check_ratid_empty(priv, sta_id, tid);
>@@ -1219,11 +1212,26 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb,
> 			if (!is_agg)
> 				iwlagn_non_agg_tx_status(priv, ctx, hdr->addr1);
> 
>+			/*
>+			 * W/A for FW bug - the seq_ctl isn't updated when the
>+			 * queues are flushed. Fetch it from the packet itself
>+			 */
>+			if (!is_agg && status == TX_STATUS_FAIL_FIFO_FLUSHED)
>+				next_reclaimed =
>+					SEQ_TO_SN(hdr->seq_ctrl + 0x10);
>+
> 			is_offchannel_skb =
> 				(info->flags & IEEE80211_TX_CTL_TX_OFFCHAN);
> 			freed++;
> 		}
> 
>+		if (tid != IWL_TID_NON_QOS) {
>+			priv->tid_data[sta_id][tid].next_reclaimed =
>+				next_reclaimed;
>+			IWL_DEBUG_TX_REPLY(priv, "Next reclaimed packet:%d\n",
>+					   next_reclaimed);
>+		}
>+
> 		WARN_ON(!is_agg && freed != 1);
> 
> 		/*
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 863424: 667944 | 670702 | 670947 | 671008 | 671345 | 671662 | 671997 | 672014 | 675302 | 675851 | 746018 | 750255 | 755318 | 764757 | 802340