From mboxrd@z Thu Jan 1 00:00:00 1970 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 BAAF2155382; Wed, 5 Feb 2025 14:28:26 +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=1738765706; cv=none; b=WWXBs7ucjDmhDGT/d/AX6px02KMCzzRnTOWGcugmMv4VCacJnPTT4JPj8IWnLwbIPgg/hIo1oy0ss7emJ2XFhE29MhX0ltdrRn82HaT2NzkIFbUgbCbPPLvgYGKDAx2eAwiTZx6/hCln8mmclMnsnQ+UCbNPfud81VBff1yfxmQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738765706; c=relaxed/simple; bh=Y56BcKlRdBADW7I8zeIEJErbQNauliNkWAq1tKvTErE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AAqx3/NkPQD8heyiBkph2rLor+8JCzVITP56ZgkmqXZVWl5+4tAWhjMIrzw+8dpXZNrSziSAp+NYrj3JwF6mWfajV5TzD36ItXCMJwSqzXy9aSovr0CiS9HMDMD4puft3SDfrwe470MrY7GQ5fLhUOl0P+vKDnpJjwJS5R+yT+M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ZaXYGEuT; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ZaXYGEuT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 232DBC4CEE7; Wed, 5 Feb 2025 14:28:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738765706; bh=Y56BcKlRdBADW7I8zeIEJErbQNauliNkWAq1tKvTErE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZaXYGEuTwJEXAPQIxz90RLCkgRIuuL14g049fiDkuFiyupY45HeGmYglx5R7MU52I FWsfvFVjHW3hbK/3zVimHuhVZ2L7Wu2Pn/Siy+6LoiOfZ2ltR4uCZHXuiWteBG6YWw OSwdh6eLAciDEPt+wZJIDyqsZDPw9tHzmeHYJMRY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Felix Fietkau , Sasha Levin Subject: [PATCH 6.13 206/623] wifi: mt76: mt7915: fix omac index assignment after hardware reset Date: Wed, 5 Feb 2025 14:39:08 +0100 Message-ID: <20250205134504.110016910@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250205134456.221272033@linuxfoundation.org> References: <20250205134456.221272033@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.13-stable review patch. If anyone has any objections, please let me know. ------------------ From: Felix Fietkau [ Upstream commit cd043bbba6f9b71ebe0781d1bd2107565363c4b9 ] Reset per-phy mac address slot mask in order to avoid leaking entries. Fixes: 8a55712d124f ("wifi: mt76: mt7915: enable full system reset support") Link: https://patch.msgid.link/20241230194202.95065-12-nbd@nbd.name Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c index b890a58d37300..799e8d2cc7e6e 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c @@ -1444,9 +1444,11 @@ static void mt7915_mac_full_reset(struct mt7915_dev *dev) { struct mt76_phy *ext_phy; + struct mt7915_phy *phy2; int i; ext_phy = dev->mt76.phys[MT_BAND1]; + phy2 = ext_phy ? ext_phy->priv : NULL; dev->recovery.hw_full_reset = true; @@ -1476,6 +1478,9 @@ mt7915_mac_full_reset(struct mt7915_dev *dev) memset(dev->mt76.wcid_mask, 0, sizeof(dev->mt76.wcid_mask)); dev->mt76.vif_mask = 0; + dev->phy.omac_mask = 0; + if (phy2) + phy2->omac_mask = 0; i = mt76_wcid_alloc(dev->mt76.wcid_mask, MT7915_WTBL_STA); dev->mt76.global_wcid.idx = i; -- 2.39.5