From nobody Sun Mar 27 20:14:13 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 7C7CC1A542E1; Sun, 27 Mar 2022 20:14:15 +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 4KRRqn750xz4nnL; Sun, 27 Mar 2022 20:14:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648412055; 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=kC5lspBgLwWGDVf85V8nKH5DrhBXia362HE8oHq0COs=; b=AkAtb6TJEYXuLpCizqH5CAOINegd57OBHyre9cWgAups1yS6rDyKawhtg8OELcnEqYh1Jg Mv8FovUQ/w8WP2z/Kn0xJXSWowBTjOO/DxYc4eacwgci902soDFBylg22OiGGVFw0GAo+u xasYcDy0qLC4MdtiATTFY9o40hLIDE7PbYkdA3jIRio+ErQUrnORSnkUogOQP5h5R3odV7 xu09wPZvD6mnTCX0j75GDVAGPfvo7vVIHWOXCQrENnFsj4t7I0JHfZ8lSzvHHHZn4f0Xoj keEUjGRFF35tCuGgyVIro5QKMI/+E7x0f439pQY3imDOA3sHE8Rz6O+n94KqGg== 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 C6FD21B9DD; Sun, 27 Mar 2022 20:14:13 +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 22RKEDHv037419; Sun, 27 Mar 2022 20:14:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22RKEDCw037418; Sun, 27 Mar 2022 20:14:13 GMT (envelope-from git) Date: Sun, 27 Mar 2022 20:14:13 GMT Message-Id: <202203272014.22RKEDCw037418@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: 39bc4b2949e2 - stable/13 - LinuxKPI: 802.11: check IEEE80211_FEXT_SCAN_OFFLOAD on vap 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: 39bc4b2949e2ac32ad211aa6f1859559e21c7eb2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648412055; 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=kC5lspBgLwWGDVf85V8nKH5DrhBXia362HE8oHq0COs=; b=FUGPV9E/7rzVcAp0b3JLrWX7qxzl6xtaKf4upWMhRr00aPJw0Z/1PTrcKIpNmN6Af2UZl/ 6xy04py0j7cMVQuA6doUDl4CGicSE4rREpAohswUNYLRZ8Z7nY6QdlQVysg/cl6qpRnicy ZGhcmc7DyqiECJp8EqH/XwiXfG+wBB3CN8TcM7DikBvQJC+Gs7Of6XbBKUriGEmVBt5ITY QSJ96h7w1JjFgvqztpDgZ7XSXMmt3AJHJEjmf/2WPid4hMkAU0nCtASjelwDGifh3TuxGV mEy4ZBHvbqWCv5D7aYHF++puSVUO+JIlzSeCZT9KU5kqVWymNG/vnW4+ki8ETw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648412055; a=rsa-sha256; cv=none; b=TkdT7mt2vEjAnyLwpK7Oh2AiLfoOUJEjl4dsyyrXcl+8+NyrzoWFmzMfm+16AvYtXSJOHs cMe4/EfgzjLE9n5gXQS5SHh/fFF1mWR4mPCziFsY7u70BTTRGysMbD40adx8gd495OVhTF 1HvdWnbGIpcyyYrH0+y0vhfjf7G3rBqBTMoZeCVW0Eo1gfjMWNQ/1Xyv+VcRzYWP+A2YHS hTtZhbHD6L2y/Owz9BiIY5pa7O8emKnSgnET6Chxd5Xd8Z9tfIKHI1TL3ZgbtVqn9Xd9pm aQwG/LMOZmpwI2C43Qkv0tz3tPU57qYP8RQ1y+qDD88VEPTMXPPUeGikcLkuMA== 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=39bc4b2949e2ac32ad211aa6f1859559e21c7eb2 commit 39bc4b2949e2ac32ad211aa6f1859559e21c7eb2 Author: Bjoern A. Zeeb AuthorDate: 2022-03-24 17:24:47 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-03-27 18:12:30 +0000 LinuxKPI: 802.11: check IEEE80211_FEXT_SCAN_OFFLOAD on vap When checking for IEEE80211_FEXT_SCAN_OFFLOAD, do so on the vap rather than ic. This brings us in line with what net80211 does. Sponsored by: The FreeBSD Foundation (cherry picked from commit 768dd32a164b35fb2f66fc8a0250cee84c79471e) --- sys/compat/linuxkpi/common/src/linux_80211.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index fe4157212106..e1e2bbe02a03 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2433,7 +2433,7 @@ lkpi_ic_scan_start(struct ieee80211com *ic) } hw = LHW_TO_HW(lhw); - if ((ic->ic_flags_ext & IEEE80211_FEXT_SCAN_OFFLOAD) == 0) { + if ((vap->iv_flags_ext & IEEE80211_FEXT_SCAN_OFFLOAD) == 0) { sw_scan: lvif = VAP_TO_LVIF(vap); vif = LVIF_TO_VIF(lvif); @@ -2566,24 +2566,24 @@ static void lkpi_ic_scan_end(struct ieee80211com *ic) { struct lkpi_hw *lhw; + struct ieee80211_scan_state *ss; + struct ieee80211vap *vap; lhw = ic->ic_softc; if ((lhw->scan_flags & LKPI_SCAN_RUNNING) == 0) { return; } - if (ic->ic_flags_ext & IEEE80211_FEXT_SCAN_OFFLOAD) { + ss = ic->ic_scan; + vap = ss->ss_vap; + if (vap->iv_flags_ext & IEEE80211_FEXT_SCAN_OFFLOAD) { /* Nothing to do. */ } else { struct ieee80211_hw *hw; struct lkpi_vif *lvif; struct ieee80211_vif *vif; - struct ieee80211_scan_state *ss; - struct ieee80211vap *vap; hw = LHW_TO_HW(lhw); - ss = ic->ic_scan; - vap = ss->ss_vap; lvif = VAP_TO_LVIF(vap); vif = LVIF_TO_VIF(lvif); lkpi_80211_mo_sw_scan_complete(hw, vif);