From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9B37217A2FC; Wed, 20 May 2026 18:32:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779301944; cv=none; b=bRsikDWBjcGw20GfRVesFyfvTfYqVINeJxtqxHNKLOnV+ovHbShdT9MOCszsPXBnSR14Ki+ihaajg/MjzvlUXgBzp/QHLhjqQw8u6BDND1phLQ9hAtCucx2iLJA0HbIyePrayz+7rL4vK6ZZN721NLKfUMgkTVQkijTxrD8dD7M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779301944; c=relaxed/simple; bh=XPGUEeZmtEDM5Jlzs6ZeLZ/ZUUzLySQtAZnWLggIS3Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HQkUzfsWHD8y6w6k5fcZ6I6fqw7D7PduVBZp2cz+RPEStL53gwue7fKqJq3MQV7tJ6I80+Ty+gPMqhU0rP6R0skBLOaOBcZ9SNHWJ8QpT2NROre3AA8SQm9kmHFeEK0WGw1v+8hjByRoJkCzvIyGoRNQGBqB8lNPuQzEoY2lKnE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=PNd58jqD; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="PNd58jqD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A9BEA1F008A2; Wed, 20 May 2026 18:32:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779301943; bh=JGles59k6HboYnKHY7EaBX9n4eyX1pyy1lWG0WZKnCo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=PNd58jqDR64TKmGjhUJUMa04xbmSh78sTifIPtwZuKabR6ZGct2fwUJInKjGOVw0z Y6rh3kAsONAHtfgTUmZ0kzaSxmJsDDHq+T273oKeYgVcRH61krYJ+007X3chRpCODt I7HrPL+Gi7WrbZdF2q3IwSiz+4GkRStZLdEL/krU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, StanleyYP Wang , Shayne Chen , Felix Fietkau , Sasha Levin Subject: [PATCH 6.6 037/508] wifi: mt76: mt7996: fix struct mt7996_mcu_uni_event Date: Wed, 20 May 2026 18:17:40 +0200 Message-ID: <20260520162059.396003391@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260520162058.573354582@linuxfoundation.org> References: <20260520162058.573354582@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: StanleyYP Wang [ Upstream commit efbd5bf395f4e6b45a87f3835d4c2e28170c77c5 ] The cid field is defined as a two-byte value in the firmware. Fixes: 98686cd21624 ("wifi: mt76: mt7996: add driver for MediaTek Wi-Fi 7 (802.11be) devices") Signed-off-by: StanleyYP Wang Signed-off-by: Shayne Chen Link: https://patch.msgid.link/20260203155532.1098290-2-shayne.chen@mediatek.com Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7996/mcu.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c index 8ab55fc705f07..9f8c312b64d75 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c @@ -204,7 +204,7 @@ mt7996_mcu_parse_response(struct mt76_dev *mdev, int cmd, event = (struct mt7996_mcu_uni_event *)skb->data; ret = le32_to_cpu(event->status); /* skip invalid event */ - if (mcu_cmd != event->cid) + if (mcu_cmd != le16_to_cpu(event->cid)) ret = -EAGAIN; } else { skb_pull(skb, sizeof(struct mt7996_mcu_rxd)); diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.h index 58504b80eae8b..fee79666fe162 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.h +++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.h @@ -25,8 +25,8 @@ struct mt7996_mcu_rxd { }; struct mt7996_mcu_uni_event { - u8 cid; - u8 __rsv[3]; + __le16 cid; + u8 __rsv[2]; __le32 status; /* 0: success, others: fail */ } __packed; -- 2.53.0