From nobody Fri Dec 19 17:42:05 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 895F915B112; Sun, 24 Mar 2024 22:38:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711319934; cv=none; b=JFKvVOEXtlC+hmz8wKbYQsG298bD0sUgDjOHvjHUu2QQ4jhM5Sy+6Pnnr7qxczlgIXbx9IQHnpze4wlXCKA1mbYzX6a0s9A5Cv6FfauB68QBR4HRa0NqtMmDNA2hYq+RwOcxDQLfAfhBomzktzy2vDGrXLejbCRkT9GFw2Ic8GM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711319934; c=relaxed/simple; bh=cMa/YebYRaM5db2GNXDbF6ZFaSOgx4eEKsBajtAisko=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IA6SECBV/Xc34D9RRb6d+v7aQhJkDX+VJ5l1oecWmRQk6iMENvx1LGK03ss8llVzQHhgWX7qJ4UwQmJMCrUaRLO+cS/ET96vzYU9lkLS5LTJnsorDDpKdLskGeX8gII6zydg5g3zG+cCB9PGFk3iMJIkamDmyBgPn2s6ty4P4oY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=eumT5jqq; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="eumT5jqq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BB943C433B1; Sun, 24 Mar 2024 22:38:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711319934; bh=cMa/YebYRaM5db2GNXDbF6ZFaSOgx4eEKsBajtAisko=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eumT5jqqSIez5GQ/7f9NBw7pStBJDB4Qdpa7GgmEbibukICMxbXs1u6eBtddn01O8 GWp0riCXo6jk2TW2zleLXtoNj1m0iTYs4oQ2mFKj/GoWNb7Hhn3VO7StXNnLUNFF99 9WOcKsB/mKmUPVFJFQKGyoaNtxKr3r+UUuQIDIfEzDYtPwGOP1kEiklHn+x8xwQpAA f1MkM0XZI4bDpKIyT7p+ND5gt7L8LTL3dJd4MlQCtey+uimkznyqo9fS/2plbGRvrB WIpxKcqyjKNti4Lu/AkFEb9JzChCPZ4kVYknXOsGhiCPAKRKTSFWTlQBlYTD0zLULB gFfieSKbjIlFQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ming Yen Hsieh , Felix Fietkau , Sasha Levin Subject: [PATCH 6.8 240/715] wifi: mt76: mt7925: fix the wrong header translation config Date: Sun, 24 Mar 2024 18:26:59 -0400 Message-ID: <20240324223455.1342824-241-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324223455.1342824-1-sashal@kernel.org> References: <20240324223455.1342824-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Ming Yen Hsieh [ Upstream commit d8cf7e1344727b80b4ec3dc17ca520238d55a88d ] The header translation config should set to broadcast and unicast cases correctly, not only unicast case. And also remove the cmds of wtbl (wlan table) series, because these MCU commands have already been replaced by other commands in mt7925. Fixes: c948b5da6bbe ("wifi: mt76: mt7925: add Mediatek Wi-Fi7 driver for mt= 7925 chips") Signed-off-by: Ming Yen Hsieh Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- .../net/wireless/mediatek/mt76/mt7925/mcu.c | 32 +++++-------------- 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c b/drivers/net/= wireless/mediatek/mt76/mt7925/mcu.c index 8c3233182083f..932ecf38672c4 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c @@ -814,6 +814,7 @@ mt7925_mcu_sta_hdr_trans_tlv(struct sk_buff *skb, struct ieee80211_vif *vif, struct ieee80211_sta *sta) { + struct mt792x_vif *mvif =3D (struct mt792x_vif *)vif->drv_priv; struct sta_rec_hdr_trans *hdr_trans; struct mt76_wcid *wcid; struct tlv *tlv; @@ -827,7 +828,11 @@ mt7925_mcu_sta_hdr_trans_tlv(struct sk_buff *skb, else hdr_trans->from_ds =3D true; =20 - wcid =3D (struct mt76_wcid *)sta->drv_priv; + if (sta) + wcid =3D (struct mt76_wcid *)sta->drv_priv; + else + wcid =3D &mvif->sta.wcid; + if (!wcid) return; =20 @@ -1577,8 +1582,6 @@ mt7925_mcu_sta_cmd(struct mt76_phy *phy, { struct mt76_vif *mvif =3D (struct mt76_vif *)info->vif->drv_priv; struct mt76_dev *dev =3D phy->dev; - struct wtbl_req_hdr *wtbl_hdr; - struct tlv *sta_wtbl; struct sk_buff *skb; =20 skb =3D __mt76_connac_mcu_alloc_sta_req(dev, mvif, info->wcid, @@ -1602,30 +1605,11 @@ mt7925_mcu_sta_cmd(struct mt76_phy *phy, mt7925_mcu_sta_state_v2_tlv(phy, skb, info->sta, info->vif, info->rcpi, info->state); - mt7925_mcu_sta_hdr_trans_tlv(skb, info->vif, info->sta); mt7925_mcu_sta_mld_tlv(skb, info->vif, info->sta); } =20 - sta_wtbl =3D mt76_connac_mcu_add_tlv(skb, STA_REC_WTBL, - sizeof(struct tlv)); - - wtbl_hdr =3D mt76_connac_mcu_alloc_wtbl_req(dev, info->wcid, - WTBL_RESET_AND_SET, - sta_wtbl, &skb); - if (IS_ERR(wtbl_hdr)) - return PTR_ERR(wtbl_hdr); - - if (info->enable) { - mt76_connac_mcu_wtbl_generic_tlv(dev, skb, info->vif, - info->sta, sta_wtbl, - wtbl_hdr); - mt76_connac_mcu_wtbl_hdr_trans_tlv(skb, info->vif, info->wcid, - sta_wtbl, wtbl_hdr); - if (info->sta) - mt76_connac_mcu_wtbl_ht_tlv(dev, skb, info->sta, - sta_wtbl, wtbl_hdr, - true, true); - } + if (info->enable) + mt7925_mcu_sta_hdr_trans_tlv(skb, info->vif, info->sta); =20 return mt76_mcu_skb_send_msg(dev, skb, info->cmd, true); } --=20 2.43.0