From nobody Thu Sep 21 17:19:35 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 4Rs2Fh26yJz4tk7F; Thu, 21 Sep 2023 17:19:36 +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 4Rs2Fh17tlz4fDX; Thu, 21 Sep 2023 17:19:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695316776; 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=+BVsB8+neRwqFG/trhRI+e1eA7e3UR3uXjZOKFTw0EQ=; b=mgTZsS5rtfviXX8AiwMznpP0MoEgyTHUTY0bx2KEWnEVaIHfMnJ6Gv+4tfPZZi9yOkKu5A l/xBby1XLtVAD4uDY1Na/bghWhYOM65guRtfWOcSiDiYUciPlJSPAuQKM1WpbT5Z0nT/mh MQL6ebkbjZFpIAnpbIYdhDPwcEbAYRcI6e5B8M7diogKqC20NpqHPD2uE82llR3IcyBuaS zq1/gnrxLMJEOg4yQ2gVHATb201GxEYcWHNgQXSmCEuMEgPkpiCTfHbw0FK5KCL6HqSYnT dYwLm6ZW1ZdzilWTSbSuWpN6oOcZzqiDFJge0Ip7Dz23oyiJq3bjvh6O31ajbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695316776; a=rsa-sha256; cv=none; b=gUfdH5QvhBniv2ieFn48XQPNXMUeLT1ckeavdGeib1WKinmV7AaHlmZzkTtIF0tVfsvOzn x32rh8cdAPFdGMzuVXM5rNJenlT/sw6k63cEqRqsxnEJts+BCPOTmyqEgVjRwr4ujd9FxO jmEOX4OD3W3AINFkXgdvakYL0o/GXJZSbHwhICjZ9iDyIsNk4FgJagyXnjW+js6Q1HMlqY D7KcDKaQPn6i8DwddOHfboJeMaENcg8vUl0ZX5tfP34N/8/KOgaQvk/FpGOWD1wnjuZezU 95MWXfKYe+Ma1sS9BX6sLXqJHLsBQ15hDqmnncGdS5jcOMaPaDpqIsyy45FFag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695316776; 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=+BVsB8+neRwqFG/trhRI+e1eA7e3UR3uXjZOKFTw0EQ=; b=efnXJP4f0bzokD9mYTl6FrrN42tpfSwjrnC9e5PGLAjJjFHMEcgBmBADgKHZgic9XaRQsE 9ykIRt7NKrwNQlvKDlp5DjO7LnqtlyqqUq7vO9JSH7Hh2VEFH8oq/DEleyfYsBf5EUdMtv 0XPlCj5i2K/a7iUMtUZrmR8SiGujqdVNDcl7haiX7NrlMJKf55bFHJKnll5T237S2lwi5i HhvjNX2zvSCt3vvHHSzFg8lTp0Hq7vnhPee4RsuC0HbJJ47FrFR6Yf/IQMYmtrRmwVuE4u a9tZV6IX+XbiPFe+MtYeI30m3qNLysCnFSpJfXYEQA9QpvNsUqevToYTamSYAA== 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 4Rs2Fh0D2dznWK; Thu, 21 Sep 2023 17:19:36 +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 38LHJZof076398; Thu, 21 Sep 2023 17:19:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LHJZHW076395; Thu, 21 Sep 2023 17:19:35 GMT (envelope-from git) Date: Thu, 21 Sep 2023 17:19:35 GMT Message-Id: <202309211719.38LHJZHW076395@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 727f88f2617a - main - 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/main X-Git-Reftype: branch X-Git-Commit: 727f88f2617acaff4ada0f3dda6ca23c6679310d Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=727f88f2617acaff4ada0f3dda6ca23c6679310d commit 727f88f2617acaff4ada0f3dda6ca23c6679310d Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 11:58:17 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-21 17:08:23 +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 MFC after: 3 days --- 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)