From nobody Thu Mar 24 18:03:40 2022 X-Original-To: dev-commits-src-main@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 F07251A3EFE9; Thu, 24 Mar 2022 18:03:40 +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 4KPY4X62zKz3QJt; Thu, 24 Mar 2022 18:03:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648145020; 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=CIN3PpX+W4rkA/NgsAalTrbUXL3Ah2VX7OljoiGejWM=; b=yC5dQtVbOCfuaTxhr/bNFkVcu43utdEYpbcJcVQAkiyKDm5encz8DRDsgUkLtRyelepIe5 IodS4GhHudgk5mRjHmRJzNUnqE7YFuQniXHZkK86R/3ACkbdaYYbzdH2Bg38tz99otfWLo FdI1Y3fMMIfgRsDifveVrxuHjQ7iBOjaeH71Ll7aZQwzB0r3vvADjAecDpXfEMveUI0mou fEgjo7ox+t7+6ce7y7xs0g0Kvh4Rexsj1AZZfCus5Mz+NECAYaa5pHGtjbv7P56c3DveCB +3scl2DW669ijUmnKCRk/nkwDLaJNZXQmn8au5JkiRvmweBUJYyKClhF4l+L6w== 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 AFEB11CBB3; Thu, 24 Mar 2022 18:03:40 +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 22OI3ehQ027412; Thu, 24 Mar 2022 18:03:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22OI3eSG027411; Thu, 24 Mar 2022 18:03:40 GMT (envelope-from git) Date: Thu, 24 Mar 2022 18:03:40 GMT Message-Id: <202203241803.22OI3eSG027411@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: 768dd32a164b - main - LinuxKPI: 802.11: check IEEE80211_FEXT_SCAN_OFFLOAD on vap List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 768dd32a164b35fb2f66fc8a0250cee84c79471e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648145020; 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=CIN3PpX+W4rkA/NgsAalTrbUXL3Ah2VX7OljoiGejWM=; b=tJ4G8dT5TvBV/XVCNF5BTvgcUj6lMnrwJFUGxRdH1yhVJFj4hVlhL7QOzuWEX4oSOCoXyF QiF9LDapreZMXTCUhD/SOE/wY3vMMntq3FBds3T4GdG9JqHz3xvTelDtk0wzzwCoXhOp54 DCaVofRL1VZDtFb1PDXjeL7ZSWDxEJgAQBOPhhGCM28ZOh/7SaIjPKrEq0+6PvbtSFMY0r akB1buSiq9/u3AW8yvdWJ4AcXqIbccdPNuBkhucE+Jksvb6H7HHak9MmmTn7uR7WY7nKQl lRIw9XTNXBvLGUsklwZjqP2tgA648ECguS/H8nPYFqQgqW3bLBu/Yy9050iuNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648145020; a=rsa-sha256; cv=none; b=kOXVyhEu0R8wda4ES9Gzzn8FuALfJmRMIwWhf6h5WcyptJP0Z0vjwJbdXoIVxeBCdDnQFs /IOPEsnLlaQ6RmzemkXosvnLK38VMtSfpbjRrp9JK1vnMGsVv2+vE9oANl4VvLOgtwty91 xVhfxfZ535KZ+0AC2oIuDY7bavVwz4j1qhNoe7huQg+nvao3VkoeRSxIz5OsF81ApIQ0q1 CbOnQ5fAwLYkHk5EHHr1N8eBLQvNRWlP9oY0JIQhtEVFFPVv+LbkIv7z/RFVqYrbPj8uaP 9t8591g+i5qkL2MHoqzrDTp+bPS9MlspnClqT8JZ6N8sdnMIpjEn6smkTs/UeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=768dd32a164b35fb2f66fc8a0250cee84c79471e commit 768dd32a164b35fb2f66fc8a0250cee84c79471e Author: Bjoern A. Zeeb AuthorDate: 2022-03-24 17:24:47 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-03-24 17:24:47 +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 MFC after: 3 days --- 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);