Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Sasha Levin <Alexander.Levin@microsoft.com>
To:     "stable@vger.kernel.org" <stable@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
CC:     Johannes Berg <johannes.berg@intel.com>,
        Luca Coelho <luciano.coelho@intel.com>,
        Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL for 4.9 132/293] iwlwifi: pcie: fix command completion
 name debug
Thread-Topic: [PATCH AUTOSEL for 4.9 132/293] iwlwifi: pcie: fix command
 completion name debug
Thread-Index: AQHTz5kjGoracPjDlEOOB49y8QJHog==
Date:   Mon, 9 Apr 2018 00:24:35 +0000
Message-ID: <20180409002239.163177-132-alexander.levin@microsoft.com>
References: <20180409002239.163177-1-alexander.levin@microsoft.com>
In-Reply-To: <20180409002239.163177-1-alexander.levin@microsoft.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: microsoft.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: aa0ccf8b-8048-4731-dc3f-08d59db11430
X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:24:35.8157
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0807
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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/wir=
eless/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 =3D rxb_addr(rxb);
 	u16 sequence =3D le16_to_cpu(pkt->hdr.sequence);
-	u8 group_id =3D iwl_cmd_groupid(pkt->hdr.group_id);
+	u8 group_id;
 	u32 cmd_id;
 	int txq_id =3D SEQ_TO_QUEUE(sequence);
 	int index =3D SEQ_TO_INDEX(sequence);
@@ -1793,6 +1793,7 @@ void iwl_pcie_hcmd_complete(struct iwl_trans *trans,
 	cmd_index =3D get_cmd_index(txq, index);
 	cmd =3D txq->entries[cmd_index].cmd;
 	meta =3D &txq->entries[cmd_index].meta;
+	group_id =3D cmd->hdr.group_id;
 	cmd_id =3D iwl_cmd_id(cmd->hdr.cmd, group_id, 0);
=20
 	iwl_pcie_tfd_unmap(trans, meta, txq, index);
--=20
2.15.1