From nobody Mon Oct 9 23:16:16 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 4S4FJx2fqlz4wh30; Mon, 9 Oct 2023 23:16:17 +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 4S4FJx1hSbz3Qcd; Mon, 9 Oct 2023 23:16:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696893377; 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=hhjlUZHvXWFkRbgvXe4+6ZPL5bje6BQctu/EFZfEaMo=; b=A84gxek0XhtEJb+m0aH5kLQ6iUgPx2nAmIwIMBkjeCGpztZHVQ8xSHZUOAfq7f5f0DYMPz S+uel+YEYi/UcQxj+48zSuqNRmqHrsUgGfBCoJiniqnpHFOKL4GvxfkPtZauAbnI5QN6m/ jPmNAzJKwXbbb+IZ/j6kdoliBbyL7fL6o3xVN7zw6b7uTZzexa1JodATh0pSUr7mfhUC2a ef4a4K3dmthlJ2xCwyx9/zsljVnshAji8insQVP5NIZ4fM6a8aYnN/JBYEsi3H+PvOXIkW 5bTsaedHYl4ZK8z9UQW6Z6qJgpMLT4CMTdp969TEcQW/iMrSDsyLzoeYQL+1iA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696893377; a=rsa-sha256; cv=none; b=ZeuUR9yX5/QUvr6CKqh8MGUVDUdpycc0R5pkRuy9vxQ/plabtMKjFNAWT/8dAYyVuEXdCb yCJsdgGI9HesYVM9z7Nxpax3v5Kwr69c+6Hmxil92oIw/lzRDQTM/r/FLtRW6xu50iELlx O9JdrdzDxUlnD5ft1EGC5q4cVpjwEVwA/0EHjnohvH43Gn11XrbnG1qamPufBu3BIj/Thl OE0xcEB6IhvxS59afDq8Wt+H3Te+v4Lz6p4zJ/maK6yC7Ydpy5wQ82cjrG70R1Hb7Jtbf6 TBr9qVyb9O5pY5PySOOD+q5Mw8923xSiTN8mpy+/pDGzzNM5i5DztHq4X65fGg== 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=1696893377; 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=hhjlUZHvXWFkRbgvXe4+6ZPL5bje6BQctu/EFZfEaMo=; b=ZCyhjW1mx7agoiQiDlel1QwFVRpbqgdTfb5iehoZa7cAe8nWn6jihbdc/uoQr3LBAXDyLK 51r2PZR6F0JRH7UDmPAayYMT2tz4Ns9u06J3bZz1atomg6SugtvZGyiUCsEigSPnskPBuY /whWWRK0eYRKImBdyoSgTyPoYaSiuYOl6wwubahmiXvu1FTp8mQOQtkgR33Dv5PMi2Y4a4 FSOsIKQQ9pE9rdmhvqmIjViUS9aAxC4ZKkUDiXV6cwOkLoqEsF/GBV9rg696M8mu3dIJrD IFAjByD2UBgXzXFzuQBd1DaNlJ6GcB0hH5DlYIrUhtV/2l8lJYBJYFmWC9hueA== 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 4S4FJx0WTJz19Q; Mon, 9 Oct 2023 23:16:17 +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 399NGGRD071359; Mon, 9 Oct 2023 23:16:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 399NGGuR071356; Mon, 9 Oct 2023 23:16:16 GMT (envelope-from git) Date: Mon, 9 Oct 2023 23:16:16 GMT Message-Id: <202310092316.399NGGuR071356@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: a965d1ebd3ad - releng/14.0 - 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: a965d1ebd3adc68bf3c445dc0d5c1db8cf5bd867 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a965d1ebd3adc68bf3c445dc0d5c1db8cf5bd867 commit a965d1ebd3adc68bf3c445dc0d5c1db8cf5bd867 Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 11:58:17 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-10-09 23:14:53 +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 Approved by: re (gjb) (cherry picked from commit 727f88f2617acaff4ada0f3dda6ca23c6679310d) (cherry picked from commit ad79da1b1ad323a00329c1c80fe9b90eb1e434b2) --- 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 c386c096add7..97a72a95e418 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211_macops.c +++ b/sys/compat/linuxkpi/common/src/linux_80211_macops.c @@ -538,14 +538,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, uint16_t ac, const struct ieee80211_tx_queue_params *txqp)