Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

[karo-tx-linux.git] / drivers / net / wireless / iwlwifi / iwl-trans-pcie-rx.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
index 3ef9eac02ff4753348eb2faf092aa38d6b2dddf2..374c68cc1d705dca84ed42d75714524f3e0569b1 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
@@ -33,7 +33,6 @@
 /*TODO: Remove include to iwl-core.h*/
 #include "iwl-core.h"
 #include "iwl-io.h"
-#include "iwl-helpers.h"
 #include "iwl-trans-pcie-int.h"
 
 /******************************************************************************
@@ -401,7 +400,7 @@ static void iwl_rx_handle(struct iwl_trans *trans)
 
        while (i != r) {
                int len, err;
-               u16 txq_id, sequence;
+               u16 sequence;
 
                rxb = rxq->queue[i];
 
@@ -452,8 +451,11 @@ static void iwl_rx_handle(struct iwl_trans *trans)
 
                /* warn if this is cmd response / notification and the uCode
                 * didn't set the SEQ_RX_FRAME for a frame that is
-                * uCode-originated*/
-               WARN(txq_id == trans->shrd->cmd_queue && reclaim == false &&
+                * uCode-originated
+                * If you saw this code after the second half of 2012, then
+                * please remove it
+                */
+               WARN(pkt->hdr.cmd != REPLY_TX && reclaim == false &&
                     (!(pkt->hdr.sequence & SEQ_RX_FRAME)),
                     "reclaim is false, SEQ_RX_FRAME unset: %s\n",
                     get_cmd_string(pkt->hdr.cmd));