iwlagn: remove warning in iwl_rx_handle

Txid was used without being initialized.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
index 3ef9eac02ff4753348eb2faf092aa38d6b2dddf2..b4eff556cd0a84de0662a8e22b91816a5302e270 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
@@ -401,7 +401,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 +452,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));