lkml.org 
[lkml]   [2018]   [Apr]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 132/293] iwlwifi: pcie: fix command completion name debug
    Date
    From: Johannes Berg <johannes.berg@intel.com>

    [ Upstream commit d490e09784a9d0a63f831e5f1104b4826e666b0c ]

    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 <johannes.berg@intel.com>
    Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
    index e1bfc9522cbe..a1f264e0ff74 100644
    --- a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
    +++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
    @@ -1766,7 +1766,7 @@ void iwl_pcie_hcmd_complete(struct iwl_trans *trans,
    {
    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);
    @@ -1793,6 +1793,7 @@ void iwl_pcie_hcmd_complete(struct iwl_trans *trans,
    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);
    --
    2.15.1
    \
     
     \ /
      Last update: 2018-04-09 04:18    [W:4.979 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site