From e895e88923a548c2e9fb9bb4e63662e47fcb57fa Mon Sep 17 00:00:00 2001 From: Emmanuel Grumbach Date: Thu, 22 Sep 2011 07:15:36 -0700 Subject: [PATCH] --- yaml --- r: 266373 b: refs/heads/master c: d56da92092c7808fea0b6ad85fd97095067a2616 h: refs/heads/master i: 266371: 55393d5feced800669dcc248dadf82fcf53acae6 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 95d73e782a68..e102bfe95e96 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a8f0d39a04beb0fd61f46ed99fd05189083b409 +refs/heads/master: d56da92092c7808fea0b6ad85fd97095067a2616 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c b/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c index 3ef9eac02ff4..b4eff556cd0a 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c +++ b/trunk/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));