[kernel/f18] Add patch to fix iwlwifi issues (rhbz 863424)

[Josh Boyer]

commit 82e26bd9bba2ca3c107ae3c5cdf24f22852f087b
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Mon Jan 28 09:28:39 2013 -0500

    Add patch to fix iwlwifi issues (rhbz 863424)

 ...fi-fix-the-reclaimed-packet-tracking-upon.patch |   68 ++++++++++++++++++++
 kernel.spec                                        |    7 ++
 2 files changed, 75 insertions(+), 0 deletions(-)
---
diff --git a/Revert-iwlwifi-fix-the-reclaimed-packet-tracking-upon.patch b/Revert-iwlwifi-fix-the-reclaimed-packet-tracking-upon.patch
new file mode 100644
index 0000000..302774b
--- /dev/null
+++ b/Revert-iwlwifi-fix-the-reclaimed-packet-tracking-upon.patch
@@ -0,0 +1,68 @@
+From ae023b2795d36f0f077e157428eb7eafa29ee412 Mon Sep 17 00:00:00 2001
+From: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
+Date: Mon, 21 Jan 2013 13:12:57 +0200
+Subject: [PATCH] Revert "iwlwifi: fix the reclaimed packet tracking upon
+ flush queue"
+
+This reverts commit f590dcec944552f9a4a61155810f3abd17d6465d
+which has been reported to cause issues.
+
+See https://lkml.org/lkml/2013/1/20/4 for further details.
+
+Cc: stable at vger.kernel.org [3.7]
+Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
+Signed-off-by: Johannes Berg <johannes.berg at intel.com>
+---
+ drivers/net/wireless/iwlwifi/dvm/tx.c |   24 +++++++-----------------
+ 1 files changed, 7 insertions(+), 17 deletions(-)
+
+diff --git a/drivers/net/wireless/iwlwifi/dvm/tx.c b/drivers/net/wireless/iwlwifi/dvm/tx.c
+index 31534f7..2797964 100644
+--- a/drivers/net/wireless/iwlwifi/dvm/tx.c
++++ b/drivers/net/wireless/iwlwifi/dvm/tx.c
+@@ -1153,6 +1153,13 @@ 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);
+@@ -1203,28 +1210,11 @@ 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 = le16_to_cpu(hdr->seq_ctrl);
+-				next_reclaimed =
+-					SEQ_TO_SN(next_reclaimed + 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.6.5
+
diff --git a/kernel.spec b/kernel.spec
index c7c1661..ff2fa2d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -779,6 +779,9 @@ Patch21234: iwlegacy-fix-IBSS-cleanup.patch
 #rhbz 892428
 Patch21238: brcmsmac-updates-rhbz892428.patch
 
+#rhbz 863424
+Patch21239: Revert-iwlwifi-fix-the-reclaimed-packet-tracking-upon.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1495,6 +1498,9 @@ ApplyPatch iwlegacy-fix-IBSS-cleanup.patch
 #rhbz 892428
 ApplyPatch brcmsmac-updates-rhbz892428.patch
 
+#rhbz 863424
+ApplyPatch Revert-iwlwifi-fix-the-reclaimed-packet-tracking-upon.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2360,6 +2366,7 @@ fi
 %changelog
 * Mon Jan 28 2013 Josh Boyer <jwboyer at redhat.com>
 - Linux v3.7.5
+- Add patch to fix iwlwifi issues (rhbz 863424)
 
 * Sun Jan 27 2013 Peter Robinson <pbrobinson at fedoraproject.org>
 - Build and package dtbs on ARM