diff options
| author | Emmanuel Grumbach | 2011-09-22 16:15:36 +0200 |
|---|---|---|
| committer | John W. Linville | 2011-09-27 20:34:05 +0200 |
| commit | d56da92092c7808fea0b6ad85fd97095067a2616 (patch) | |
| tree | e89ccd1c07d0acb6a99fb94b059c4467a2036e1f | |
| parent | ath9k: fix a regression in ath9k_ps_restore (diff) | |
| download | kernel-qcow2-linux-d56da92092c7808fea0b6ad85fd97095067a2616.tar.gz kernel-qcow2-linux-d56da92092c7808fea0b6ad85fd97095067a2616.tar.xz kernel-qcow2-linux-d56da92092c7808fea0b6ad85fd97095067a2616.zip | |
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>
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c index 3ef9eac02ff4..b4eff556cd0a 100644 --- 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)); |