From nobody Wed Nov 29 16:38:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4J3mfGz52x0P; Wed, 29 Nov 2023 16:38:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgQ4J066pz3JQH; Wed, 29 Nov 2023 16:38:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PXdb6NCZTE4wWRFwW2lZnJce90iNG0pgorgxFw2Ie2k=; b=BnI6OpI/pdeL3xol8xHYJJtJc3gizkk3h159qlFxA9ZdvfB69USA8WKlFtWXhF05cS73lw NbwJMOQhfKrrJAQLnVIxjes1Kg6I1ELM5yVa1JBL1WyW+otjaaBKmLiMfqnJVJW7dqeH0O AbQLUv+FECt1tn+2ea14g2CgkSONxzNAk9rqf+hp/poEZZfc51IsvDRrOPZNHfO29/HwYy FNJvJkOeP+ERANZcseYlWT4jnfKYTGpLxUKgRCfdXb4J6lMf0xnXOPg9G4hwiTW2sme9oo wrv4y2itN+P9Jouqut6pbDZMGVnZJiQIb+EFe3Y5Qvgaq/eH8+momYINXVWrrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PXdb6NCZTE4wWRFwW2lZnJce90iNG0pgorgxFw2Ie2k=; b=NBd8aC7MNRBfmawU7o+CfMF6Q13sCuvNr6ikwKPLsQLjn9RkibDpYTjwNvDdGqX8X4oUR+ mDBeoX6SPKobHdnD1hCo/TQ5xkiXV1fHQZbZIAFzia0gbSDgQ7ftWpYXgTAM4PAr8ySCn1 6GVHQlP0kG4Z6/SIru6nghrE/zoCxAT8+yrVtki+iRdPQkjOaekTKyytTcGIVTeiMbEdnF cH6h3W8nMsNmhlQ4eho7jnYOpNHraoCc/aqxGAh2B8cmP0QEFNuqKB/C3xLq5CaRyODJF/ rVcL8aX3125lEbgUja6BP+15mHOCKVPaVA4S5PjuS1B+qjnvEFV81WM/beJ6Wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275904; a=rsa-sha256; cv=none; b=rCA5eWihPHnhkrhbe90W8QT98QJDI4UFEFLKRV+YuaJPNZFnJd2zGrbNMTXFRsMvrYOyGu cU7HL8UmtH10aXwjSQ3Yvav4mS13X4Wg+cbxstNBPCxeRq8S8s2bjVFUZ6Lenega1b1Bti 3Lja58HQRCzcIff67cfett/I10fTK6I4jiEiVbMBnN1fkufOznJraCLL3qylOgMVpw68KK zEhrpyTAj1hwZA/hAbMyI4BJ497dIcFF8fhcDOoLbOyI+a0F2IYIS5iIU2/2XKZrWTdpDW i7Xp0/8/yXqNBMCF5ztw2y4QT4O8n0HrtbwbGaHl9gOX9N0b0/ay8TSL9Ex3VA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4H6Hrsz1Bh2; Wed, 29 Nov 2023 16:38:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATGcNNE045691; Wed, 29 Nov 2023 16:38:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcNIM045688; Wed, 29 Nov 2023 16:38:23 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:23 GMT Message-Id: <202311291638.3ATGcNIM045688@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 21ee781ddc35 - stable/13 - LinuxKPI: 802.11: mac80211 ops: distinguish between {bss,link}_info_changed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 21ee781ddc35ecad97f7d3f7b3624f7babeccc62 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=21ee781ddc35ecad97f7d3f7b3624f7babeccc62 commit 21ee781ddc35ecad97f7d3f7b3624f7babeccc62 Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 11:58:17 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:07 +0000 LinuxKPI: 802.11: mac80211 ops: distinguish between {bss,link}_info_changed With MLO and multi-link setups if avail we want to call link_info_changed whereas for legacy drivers we still need to call bss_info_changed. While we currently do not (yet) support multi-link configurations we still need to drive the correct commands to satisfy firmware requirements. Sponsored by: The FreeBSD Foundation (cherry picked from commit 727f88f2617acaff4ada0f3dda6ca23c6679310d) --- sys/compat/linuxkpi/common/src/linux_80211_macops.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211_macops.c b/sys/compat/linuxkpi/common/src/linux_80211_macops.c index 8444c3b3f245..b3b53d23f62e 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211_macops.c +++ b/sys/compat/linuxkpi/common/src/linux_80211_macops.c @@ -540,14 +540,17 @@ lkpi_80211_mo_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vi struct lkpi_hw *lhw; lhw = HW_TO_LHW(hw); - if (lhw->ops->bss_info_changed == NULL) + if (lhw->ops->link_info_changed == NULL && + lhw->ops->bss_info_changed == NULL) return; LKPI_80211_TRACE_MO("hw %p vif %p conf %p changed %#jx", hw, vif, conf, (uintmax_t)changed); - lhw->ops->bss_info_changed(hw, vif, conf, changed); + if (lhw->ops->link_info_changed != NULL) + lhw->ops->link_info_changed(hw, vif, conf, changed); + else + lhw->ops->bss_info_changed(hw, vif, conf, changed); } - int lkpi_80211_mo_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, uint32_t link_id, uint16_t ac, const struct ieee80211_tx_queue_params *txqp)