From d490e09784a9d0a63f831e5f1104b4826e666b0c Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 3 May 2017 12:16:48 +0200 Subject: [PATCH] iwlwifi: pcie: fix command completion name debug Git-commit: d490e09784a9d0a63f831e5f1104b4826e666b0c Patch-mainline: v4.13-rc1 References: bsc#1051510 When the command name is printed on command completion, the wrong group is used, leading to the wrong name being printed. Fix this by using the group ID without inappropriately mangling it through iwl_cmd_groupid() - it's already a u8. Also, while at it, use it from the same place as the command ID, everything else is just confusing. Fixes: ab02165ccec4 ("iwlwifi: add wide firmware command infrastructure for TX") Signed-off-by: Johannes Berg Signed-off-by: Luca Coelho Acked-by: Takashi Iwai --- drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c @@ -1706,7 +1706,7 @@ void iwl_pcie_hcmd_complete(struct iwl_t { struct iwl_rx_packet *pkt = rxb_addr(rxb); u16 sequence = le16_to_cpu(pkt->hdr.sequence); - u8 group_id = iwl_cmd_groupid(pkt->hdr.group_id); + u8 group_id; u32 cmd_id; int txq_id = SEQ_TO_QUEUE(sequence); int index = SEQ_TO_INDEX(sequence); @@ -1732,6 +1732,7 @@ void iwl_pcie_hcmd_complete(struct iwl_t cmd_index = get_cmd_index(txq, index); cmd = txq->entries[cmd_index].cmd; meta = &txq->entries[cmd_index].meta; + group_id = cmd->hdr.group_id; cmd_id = iwl_cmd_id(cmd->hdr.cmd, group_id, 0); iwl_pcie_tfd_unmap(trans, meta, txq, index);