From nobody Fri Oct 06 14:25:08 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 4S29gS3V6Qz4wgXp; Fri, 6 Oct 2023 14:25:08 +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 4S29gS2ssnz3QhW; Fri, 6 Oct 2023 14:25:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696602308; 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=U8jvU6Wr6op+uhR2376a/y32WEE5wjtIG0CBm8zwwSA=; b=NefxwSaD9BbqYgjbt9AqMUIl+8WZ5qJMziKmxdENWe3of8H/CUaP+D3hI30dSg/Es+G06H 4wwi9WN40joCoARB0/GFj9j+yGprLuMrkIpz9leyGd+FSw6c2ssqTqjxzUp7AxF6UT+ZS7 mKakMZax7XSaUWk/8gQ/ZHpSLLs/1O9et4otiIBdj3t+78lUtKRuJOknwRXooA7Rks3/cV GKm7OMQYLpmzxOsZhbksnVZRGhWmOvEzAPXaadWRkRSvb0FqDLatd2OIjTuBZr+ChGv6nG Xj4aLAmatgC9nKaP1o+GWFTY6LCfI7n+8h+6hUKgpKvQr97MC6uBvKb4AHmSRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696602308; a=rsa-sha256; cv=none; b=T4ulEiZVeLanqq1glQoVYIpH+MYnZzOfoasxPSXH3vHeMmWzE718cNPPTiW/6YIueunb8+ j062Es0YYbhji6GlxRGM290h9ED7LBKBFKgr7IcN/HiglZ04zl/LpkacGdIb49xhmAbT8V hiOE38I4hxYvEzUNJU5OzOTN/b6L4J0SHqXddd9RA8ASs3lID/MKC4fUvIx8CxvMr9i2Uc XdIkykyxp1n9SXbqKiM6ptxevd6q5Z7lwWAYo4BDZFpLU1eFBD5h8Dc8YFk3B5/yWJuPnq zoF2hrWLygkxnSAldHn926C9QRdOfoZfOCAGa22Z8e6Q5XPx5fj+xgygxnLBsg== 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=1696602308; 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=U8jvU6Wr6op+uhR2376a/y32WEE5wjtIG0CBm8zwwSA=; b=tew2AXD3yHwbpi1szM0RRlK5fgDMh8M/AlihT0hfDJJtr07s04DmpzeAaEZS05LSJt9F91 DjB9Kx9dbMMUrq9vp4jxcbK5noEophZ22867HYLa48y7xPkH2DQTlGzzj7mUEv6s8pwmJM YHM3Ea7AG+ycPPn/RxBMYw08pBdTpuR2NwSRzX4F40Os6w+dErjNUBr1ULWhhO8RPxjJXR sAYbMMwzPkcSP1O23iH3RpHey8WY2lyB+2VGJYmXenEcy6w+VR2yd5+psnwiAoJKXgo8Yo COFqG2/lwIc7yWARCNyLj7odIvZwjNwvncw/osBfcIlWMmt9it8sudCL5Sn+xw== 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 4S29gS1wfJzrNn; Fri, 6 Oct 2023 14:25:08 +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 396EP8oQ093182; Fri, 6 Oct 2023 14:25:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 396EP8pf093179; Fri, 6 Oct 2023 14:25:08 GMT (envelope-from git) Date: Fri, 6 Oct 2023 14:25:08 GMT Message-Id: <202310061425.396EP8pf093179@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: ad79da1b1ad3 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: ad79da1b1ad323a00329c1c80fe9b90eb1e434b2 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ad79da1b1ad323a00329c1c80fe9b90eb1e434b2 commit ad79da1b1ad323a00329c1c80fe9b90eb1e434b2 Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 11:58:17 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-10-06 12:47:39 +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)