From: Johannes Berg Date: Fri, 26 May 2017 09:16:39 +0000 (+0200) Subject: iwlwifi: pcie: improve "invalid queue" warning X-Git-Tag: MMI-PSA29.97-13-9~5285^2~16^2^2~29 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a395058eb61c888ac5624cccb40eaedf77c01472;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git iwlwifi: pcie: improve "invalid queue" warning Print out both queue IDs to be able to see what went wrong. Signed-off-by: Johannes Berg Signed-off-by: Luca Coelho --- diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c index cd109740632d..6544facc2e0c 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c @@ -1129,8 +1129,12 @@ static void iwl_pcie_rx_handle_rb(struct iwl_trans *trans, if (pkt->len_n_flags == cpu_to_le32(FH_RSCSR_FRAME_INVALID)) break; - WARN_ON((le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_RXQ_MASK) >> - FH_RSCSR_RXQ_POS != rxq->id); + WARN((le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_RXQ_MASK) >> + FH_RSCSR_RXQ_POS != rxq->id, + "frame on invalid queue - is on %d and indicates %d\n", + rxq->id, + (le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_RXQ_MASK) >> + FH_RSCSR_RXQ_POS); IWL_DEBUG_RX(trans, "cmd at offset %d: %s (%.2x.%2x, seq 0x%x)\n",