>From 938ff5d1742cd27b66b70c2d17ec2bc4ee7d87a9 Mon Sep 17 00:00:00 2001 From: Wey-Yi Guy Date: Tue, 22 Nov 2011 12:09:10 -0800 Subject: [PATCH 1/1] iwlwifi: Detect bogus command and return If firmware error and sending bogus command, report and return. Signed-off-by: Wey-Yi Guy --- drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c index 049e3b6..2a65407 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c @@ -925,11 +925,13 @@ void iwl_tx_cmd_complete(struct iwl_trans *trans, struct iwl_rx_mem_buffer *rxb, * command queue then there a command routing bug has been introduced * in the queue management code. */ if (WARN(txq_id != trans->shrd->cmd_queue, - "wrong command queue %d (should be %d), sequence 0x%X readp=%d writep=%d\n", + "wrong command queue %d (should be %d), " + "sequence 0x%X readp=%d writep=%d\n", txq_id, trans->shrd->cmd_queue, sequence, trans_pcie->txq[trans->shrd->cmd_queue].q.read_ptr, trans_pcie->txq[trans->shrd->cmd_queue].q.write_ptr)) { iwl_print_hex_error(trans, pkt, 32); + rxb->page = NULL; return; } -- 1.7.0.4