From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oi1-f171.google.com (mail-oi1-f171.google.com [209.85.167.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B31F5371CFC for ; Fri, 6 Mar 2026 23:23:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772839409; cv=none; b=oOzm0Nd6IcBPo/bg8mDBYV59QZCJLNWHmjQi1qbR1vUkKUCQ+HUOYHC69J5/o2lCNVO+YzoUlDuvFpUQKWwqUAdBtLBjSVPdjq9oPz9CY6Pmjn/UZud8Zd8jrJagn6d4MzrNZzzEVfYVh9idNqc9DVQmG/bk5VCp4ZeODzwMOvA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772839409; c=relaxed/simple; bh=RVRUVo8LeJmbpmT5rajQGdDAVSHFXxEHJ+s4MSw2aDU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YO5S8g1VCGGSXKIk424H3tbc4fde8DnXgwZQr9B33ZAl3DdZoQXQAE1c/MQ0Y22OJXlqxOY/r3gCoyi3nepWv5w7reuRc74y86ZXFIB3FiOacOunRmMkhYNCcV9yr//ZVmYryHCjFnEeVw7INlNBkXs6OuZu20h+Jw2WhZkPjoY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.167.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-oi1-f171.google.com with SMTP id 5614622812f47-46413b2c3d8so3857683b6e.2 for ; Fri, 06 Mar 2026 15:23:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772839408; x=1773444208; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=fiCd21RRNVunHfikiq+alj3bx9CAi4ebqKg+SQ/IzOQ=; b=UohZLfwzM1Dpn/cdXEV0Xk4+zNR+btG16Et0KsR7iL//q7S983q5EX7aRCbMyifChQ jcdm5gLLJL1+Ow0sjNINrIRcP8VqdUrjx23C4x/BBtzt58H345808Ca/90wWKCwDGD8Y vex5kgVkGxLLeXWPsaeJNspcduXbbSHSaHVXFIDIoxiLqUuskzMHoXtZHnO4LIv+HRQP 3no5TfZrrfNmztJXfFbka1aA5OtdWWhaI6cNi3P/BATYLtRQfoVNy4a8R/O4vBsP+HBt GfiYvBdueBBVjwZpvY7z25yuods0x8+YlXnetabG0NvO00EihWe4OA7ZnQ7m6+88Idxy WIHQ== X-Gm-Message-State: AOJu0YzAdxRXd5RtqV+0ectfk4IpHEfWqyADaQepguBaz7iYE1AnGMtP 34OyZvVDAE1sQ3/FLXeFJp1PAQ4hlCFHaRDeQ8Jxtx+KmpuBsdW/S6UB X-Gm-Gg: ATEYQzyS7HAhD1f4+CzmbJt/AX1Vw9ogrvER7JXvBMswTRRP4mctK+Uv2pWT0IMB9AJ zf+2LubzNb4jNgDnoWc+AtZ/OIVcqNn5Z+afa6NXQr6jRX3xq0Pw04oRij2PRNh7JPZasiC1Ezb 0BySEtC44tT6s9oBw/8cIUENDqrhTYFY/tgIQk5zSoZlVVyucbHYMQesSR5VzvKrG6S/iLQ51WS 2BizmJVZzB9+Nhhp98EbqyrVq+NTRpLb4ubt5s5yV8xqUwltNQ2v6yYBX3dxVL71W8zyLu51U8u hJpAtr/9X1OpyhyRq0QrYYxLi7e0zrSV5ibmLXGAxWKiSqA7f+K0hLjgbT1TT5IIZkpq9MnLH6M HSU4R6J2/ZYewXO1gVogYtRaFYy8ZILkV2JjGkiKmxPKFonFtlUfeADpEtf6jMXYwkG43gaFWmt Tk3Fqj9ui3kYRUjY5UbL8Gg10r6euFhupidYSV7NDGq0CJQgw= X-Received: by 2002:a05:6808:1b2c:b0:45c:9b3e:64ed with SMTP id 5614622812f47-466dcbb9369mr2064426b6e.60.1772839407720; Fri, 06 Mar 2026 15:23:27 -0800 (PST) Received: from sean-HP-EliteBook-830-G6.lan ([207.191.35.252]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-416e65b1c82sm2572344fac.5.2026.03.06.15.23.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2026 15:23:27 -0800 (PST) From: Sean Wang To: nbd@nbd.name, lorenzo.bianconi@redhat.com Cc: linux-wireless@vger.kernel.org, linux-mediatek@lists.infradead.org, Sean Wang Subject: [PATCH 06/19] wifi: mt76: mt7925: pass mlink to mac_link_sta_remove() Date: Fri, 6 Mar 2026 17:22:25 -0600 Message-ID: <20260306232238.2039675-7-sean.wang@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260306232238.2039675-1-sean.wang@kernel.org> References: <20260306232238.2039675-1-sean.wang@kernel.org> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Sean Wang Drop the mt792x_sta_to_link() lookup in mt7925_mac_link_sta_remove() and pass mlink from mt7925_mac_sta_remove_links() instead. The link is already resolved there, making the extra lookup redundant. This keeps the remove helper lookup-free and avoids hidden dependence on msta->link[link_id] during teardown. No functional change intended. Signed-off-by: Sean Wang --- drivers/net/wireless/mediatek/mt76/mt7925/main.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/main.c b/drivers/net/wireless/mediatek/mt76/mt7925/main.c index d7a09a0a79fb..ddff6c5ab876 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7925/main.c +++ b/drivers/net/wireless/mediatek/mt76/mt7925/main.c @@ -1121,16 +1121,12 @@ EXPORT_SYMBOL_GPL(mt7925_mac_sta_event); static void mt7925_mac_link_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif, - struct ieee80211_link_sta *link_sta) + struct ieee80211_link_sta *link_sta, + struct mt792x_link_sta *mlink) { struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76); struct ieee80211_bss_conf *link_conf; u8 link_id = link_sta->link_id; - struct mt792x_link_sta *mlink; - struct mt792x_sta *msta; - - msta = (struct mt792x_sta *)link_sta->sta->drv_priv; - mlink = mt792x_sta_to_link(msta, link_id); mt7925_roc_abort_sync(dev); @@ -1213,7 +1209,7 @@ mt7925_mac_sta_remove_links(struct mt792x_dev *dev, struct ieee80211_vif *vif, if (!mlink) continue; - mt7925_mac_link_sta_remove(&dev->mt76, vif, link_sta); + mt7925_mac_link_sta_remove(&dev->mt76, vif, link_sta, mlink); wcid = &mlink->wcid; rcu_assign_pointer(msta->link[link_id], NULL); -- 2.43.0