From nobody Sun Feb 20 18:15:44 2022 X-Original-To: dev-commits-src-branches@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 1938519CF5B2; Sun, 20 Feb 2022 18:15:45 +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 4K1tsD416Cz4XpX; Sun, 20 Feb 2022 18:15:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645380944; 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=k3YOEv7xSmE8MLVQo/S5XeMdXuh+MJiEpZ++v2v1fho=; b=l8u4JuTKFc+NFN4EoOims9OyRasPoWObyD61mCoCQbJY5zdcersDmyqEo9DpDnQpX/xfsL 6SN5uJxgh/lMpHM2LZHbjWSapqwfN9q/3yFS7Z1lcABaXwSIcuabmuBr06Bsfn9/tuxtBW mBlYHzZOuMMOvqcH2DctSCyYDIfUtw8b66YJ19h7TN33R5JfjatuMVScQWpdM/2FmrxeyS rcXbcI6OIlvz5nyBot1PAi7+4J+F2bk0L76Rip6q/lonU01CHFPJlW8JTWijtmHI36Yzbq R7l7EW4kBAl/WRh/HJYTWYIuuiryHv1cz/gsvuhpKTiL3KQzWbzg56baR2jsIw== 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 4B0D420C57; Sun, 20 Feb 2022 18:15:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21KIFiwV023080; Sun, 20 Feb 2022 18:15:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21KIFi82023079; Sun, 20 Feb 2022 18:15:44 GMT (envelope-from git) Date: Sun, 20 Feb 2022 18:15:44 GMT Message-Id: <202202201815.21KIFi82023079@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: fb8b8b6a1d3a - stable/13 - LinuxKPI: 802.11 enahnce linuxkpi_ieee80211_iterate_interfaces() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: fb8b8b6a1d3a5c198399672ab83cf4cc5c083e4c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645380944; 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=k3YOEv7xSmE8MLVQo/S5XeMdXuh+MJiEpZ++v2v1fho=; b=tHonRssQbGJ4q7sItSXSA15HNtJSqoVoFxphfxv5GbfQKp0zt2y2gZBXUviW/o9NcYscFD tH66ZJy+A9aGRcji5tALgUyDa5sZV/VLEtF6eT8pG56tCT2UgMhjouyPeWk2Z+8lZ5tjEn 3sO7yxATQtXZG0LMUUThdJzlCwmYpvaSdmfolIUEXDT4LEyFJ/XrlqGr2OL6MCGrkSfWbY NOAxdykqh6wrybcodo0THsU7lcaHVuynQkmCBQ24Cc/dv4OgB45MGnUck9ACE9Gw9sh0LZ v83In/daGMEovTldfM2EK6TEia44gd9YSle7cmJiwAWKQKPEv1hG/6plsNe4iA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645380944; a=rsa-sha256; cv=none; b=hCJMYohVU5TwAOACGWg+N1Yqgjx3JvV54jbB0aW3TssW8SJI0bybY4+LeA4dEhwvW6P9JA kV7pP34tQjRXYgLwn3l1Q4xEX4bd0Wchwo9GiBTfuvtVZwwBK16+60w4COztsyJddnvIBn xJ8gofDwOP3tdvImYRs5HOCDc3fLiYU8G4FDgWy/dshsp+Oxoic30hNOX777fk9z3gecFf Ho4KuDVrTLy7KKTxfCdE6HMM7y3H2U33TLkZd5v98ly7ndqV2EqwE7/GiCpB9HDBAXX/cG NOuzWIhqwqeIRUhz/lCbcd1PmCbC/d1R6S052qR2BYGDntOnBmo45nhs4XJCAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=fb8b8b6a1d3a5c198399672ab83cf4cc5c083e4c commit fb8b8b6a1d3a5c198399672ab83cf4cc5c083e4c Author: Bjoern A. Zeeb AuthorDate: 2022-02-16 03:56:54 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-02-20 16:25:08 +0000 LinuxKPI: 802.11 enahnce linuxkpi_ieee80211_iterate_interfaces() Add support for IEEE80211_IFACE_SKIP_SDATA_NOT_IN_DRIVER in linuxkpi_ieee80211_iterate_interfaces() needed by a driver. (cherry picked from commit 61a68e50d436333396ffd2e1d6a4b5d2875f8118) --- sys/compat/linuxkpi/common/src/linux_80211.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index c69df86c3fa2..8e5e948db5fa 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2930,12 +2930,13 @@ linuxkpi_ieee80211_iterate_interfaces(struct ieee80211_hw *hw, struct lkpi_hw *lhw; struct lkpi_vif *lvif; struct ieee80211_vif *vif; - bool active, atomic; + bool active, atomic, nin_drv; lhw = HW_TO_LHW(hw); if (flags & ~(IEEE80211_IFACE_ITER_NORMAL| IEEE80211_IFACE_ITER_RESUME_ALL| + IEEE80211_IFACE_SKIP_SDATA_NOT_IN_DRIVER| IEEE80211_IFACE_ITER__ACTIVE|IEEE80211_IFACE_ITER__ATOMIC)) { ic_printf(lhw->ic, "XXX TODO %s flags(%#x) not yet supported.\n", __func__, flags); @@ -2943,6 +2944,7 @@ linuxkpi_ieee80211_iterate_interfaces(struct ieee80211_hw *hw, active = (flags & IEEE80211_IFACE_ITER__ACTIVE) != 0; atomic = (flags & IEEE80211_IFACE_ITER__ATOMIC) != 0; + nin_drv = (flags & IEEE80211_IFACE_SKIP_SDATA_NOT_IN_DRIVER) != 0; if (atomic) LKPI_80211_LHW_LOCK(lhw); @@ -2961,6 +2963,13 @@ linuxkpi_ieee80211_iterate_interfaces(struct ieee80211_hw *hw, (flags & IEEE80211_IFACE_ITER_RESUME_ALL) != 0) continue; + /* + * If we shall skip interfaces not added to the driver do so + * if we haven't yet. + */ + if (nin_drv && !lvif->added_to_drv) + continue; + /* * Run the iterator function if we are either not asking * asking for active only or if the VAP is "running".