From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oi1-f178.google.com (mail-oi1-f178.google.com [209.85.167.178]) (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 59745371CFC for ; Fri, 6 Mar 2026 23:23:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772839407; cv=none; b=Mm3lDtD6TQNrGHBCdXWskwTnM8wApesk0vE+xEPfrdXrGJN4+JJTPpl7fYGRzAFtftkgz9tjpQK5MZM6xYkI9dCpqT7nTyHBhNDI1kt/qmeh0feyGRjDnBvMRj3zT0HaYPGo/oWc/aYTDdegB7gtZjddid3lSl8IBUJKQG+N0w8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772839407; c=relaxed/simple; bh=pSsAmRZovrkDxyEfkFzyXnkRJZ/I1UOrJCQk/kFTHEE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PL5JAOdY3FGBELk8TOotS/cYBNGkAfq5CKoZKQzLQVc5MGVcPeyu6Xq0Ezk7uQNR5RcG86InvwKnB0ZrHf5VR89uEp37qB26Vubetq1oIqBqKc2H1lMFWQitffsuSxzzxH/7JWwGunN5XMjosE0NfwCH49sAjd4C65ALcwWB0qg= 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.178 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-f178.google.com with SMTP id 5614622812f47-46398742245so3608409b6e.1 for ; Fri, 06 Mar 2026 15:23:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772839405; x=1773444205; 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=yU7MPZjKMz2Ng+u3kVxqlDdH/Uz0ouRNr+7md13U8oQ=; b=Ub1+EvuSFqZRxavjCQyw9jf+YPdHjhMjS9TgwMHD/JTsO8LetZM+2TqHYHSh7lqTRT 3n42r0KVp7Zt4IBVzczltN5TQ6PNGHitGMLvBprSHK1tLQ7ZyLpYiLHsaeoyf0pljc3Y BDODhsTvmcWtHor3VGmCN7tAs8oluXzH/KC0hDMRr5ShO1viJXMAR7AN0Z3O04o76T+J KlyFkNKVZaCNC8nFWQWN1WbYgYchM47+W/MjCFMsDLn8E2Ye8x30oGbKlF5wrlYEQ1J1 Pag8oSv3pS2en/tvVweU4TjSFa6vInyfyNNwYVVOHZvB39MSk02mIsYJzfa78x3KfimM Fxng== X-Gm-Message-State: AOJu0YxstJFXpz9Cz28masKdfEd2lDBlByeWcutVU2XCpYmTcuoXgUuC 6c9I+G3OnQu+AEk6BB4AfGObEebOLJfdvy5Z7MyghDuknLVxfaAhDtOS X-Gm-Gg: ATEYQzxPDqCi9DCJAG5zFch11jF7cEpQGFbnbSEQ/SzwhhUYZ6e+DcsbWnI61Mf12Z4 x3sCHYS6naP6MhcDbg3A0w3MqiSm0g1Pe+NcJElx3y2zNvMeNgmKik+ga9FxhtBq+eHM5ybmKDw EiCl9cQrHI9ndqQz0nJ5oDw1w2R4nkDU5OBSYvktdAbp365FZxtxr8On6wtOd5c9IwfoioxBfpX W14opLnKvl9qMc46D9NHcZLzZ34ZuukAXwjTciPzSEVK/LMc3gYAJhgrXI4mcvRa22DurLMvUDD WebUyKtpce/kKtgcQEHjSvdb64iYvDwKKs8DMd+RX6hHeFFXZHSP/7IUqJXVYLguIOWYaipTvOK OQaYbE7v2gqnT28ZiOM0Gmx/+dozqXLI2IXZe5vA97czUlsy8JeX7hAjjgamj6CbDJxANT7xSr/ 0f2R1K2+oPF1Oy8ip7LolfScQUkmjal05/HR6EudTIuIzzU68= X-Received: by 2002:a05:6808:3025:b0:45a:8cdc:669 with SMTP id 5614622812f47-466dcb9a23emr2150875b6e.59.1772839405224; Fri, 06 Mar 2026 15:23:25 -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.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2026 15:23:24 -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 05/19] wifi: mt76: mt7925: resolve primary mlink via def_wcid Date: Fri, 6 Mar 2026 17:22:24 -0600 Message-ID: <20260306232238.2039675-6-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 Use mlink->wcid.def_wcid to obtain the primary mlink in mt7925_mac_link_sta_add() instead of calling mt792x_sta_to_link(). The primary link context is already carried by the WCID, so the extra lookup is redundant. This makes the add path follow the existing WCID association directly. No functional change intended. Signed-off-by: Sean Wang --- drivers/net/wireless/mediatek/mt76/mt7925/main.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/main.c b/drivers/net/wireless/mediatek/mt76/mt7925/main.c index c65e32a14c01..d7a09a0a79fb 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7925/main.c +++ b/drivers/net/wireless/mediatek/mt76/mt7925/main.c @@ -927,8 +927,17 @@ static int mt7925_mac_link_sta_add(struct mt76_dev *mdev, } else if (ieee80211_vif_is_mld(vif) && link_sta != mlink->pri_link) { struct mt792x_link_sta *pri_mlink; + struct mt76_wcid *pri_wcid; - pri_mlink = mt792x_sta_to_link(msta, mlink->pri_link->link_id); + /* alternative lookup via def_wcid */ + pri_wcid = mlink->wcid.def_wcid; + + pri_mlink = pri_wcid ? + container_of(pri_wcid, struct mt792x_link_sta, wcid) : + NULL; + + if (WARN_ON_ONCE(!pri_mlink)) + return -EINVAL; ret = mt7925_mcu_sta_update(dev, mlink->pri_link, vif, pri_mlink, true, -- 2.43.0