From nobody Mon Jun 26 12:08:19 2023 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 4QqRSh0NP0z4k6GQ; Mon, 26 Jun 2023 12:08:20 +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 4QqRSg6kn0z3RM4; Mon, 26 Jun 2023 12:08:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687781299; 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=CcaF2ViPLgdQaG0lnDT5uzXB8bu44UgLdTc4zs064q0=; b=GrHrbxQ5jkSWmZT5lLexHCic0z89Um1xJQ/SUj5irk0m2j7tkYcbkixh51dj3Txmp+BhMo JNOqk8mnWC7tXkClP+joE4w4lw56cHHdO/bwDsUZUDaGKvMEzZPY220C0C/qVFK9z8Hoxi UvfOy+bjjEfnKgK1XaFVnfu2A38KeJgd1qbuOcuwwNZa/JXw/9M5iQb3ixzqwWeokGbbTQ dvQw2COHzAZwXg0+SeZkMcfvicQAyGOszkhE6KJgsSe/IU5jphQyoe6TuG5V7DbDSkWyJk GQM0ItX2NtDDTGozScUT7kGZAanjeOrxZK2HLd2qieQHTVoLXGwBKKu36dP9PQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687781299; 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=CcaF2ViPLgdQaG0lnDT5uzXB8bu44UgLdTc4zs064q0=; b=pNuBofQcp+mQHoL1qHD/jNmMVkYwHitKSqeEMwIuvt/gjGqcNoCFBBebFcvAG53mN8EzHB UyxTJwLERWxF1MXSTp8fB1AvvatZClypeqOyVeGpcJMMmHyq8ZBJEnIoiA4G6r+voWY3sV zWbnbUah8AeQEHB/HNc34uuR6UyOEuO2iy09jQfBcVfiWpbhv1yYxoi9wO5gN77G7Q+A7k QgMJd2OP5ccs1HBPg8JCfAtNTlT1mrQGWi6c9ehMdWEn3/X1vrQyI0PdDYnAWu83ouCuIL aDrKBwOMBBb6GUVvvKHW/g9CUPkYBWVWuIW9LTj6jJqn5EW9zHrWC1xI9AV7BQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687781300; a=rsa-sha256; cv=none; b=Bho53T3HLBLk2CQhK13jLU/LOMd3gj3jcBcGj0Bms9yhUuvZrxP6o6JbID3gQyJ3WfRgIa GggJAca3AdzmvT+HsHtCNtqjxolPkxX5KgU1K/Ci5vMtmk+lOue+wIqbsh4VnJYsSKL1Ao v2sWwuqqIDP4LCVnaybGBWB1NMcw0Y7Z5eFab72Rzx76AeJ1u1WiddXa7FtC/H/kdRHkjj IkJGGBCcETPFTgesk4gfnYP0QdOtF9YjVZSRDepAT1oO6U246p7IxCZ4CzaX2NSR1+2CZl Z3Ap2E9X3cqdGQyliW4DzAqVPEGS+j+/YQQyQ6pYrnwZ8n8DqTQ+QIWKYVLJjA== 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 4QqRSg5dBdz18LZ; Mon, 26 Jun 2023 12:08:19 +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 35QC8J9s082771; Mon, 26 Jun 2023 12:08:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35QC8J0R082770; Mon, 26 Jun 2023 12:08:19 GMT (envelope-from git) Date: Mon, 26 Jun 2023 12:08:19 GMT Message-Id: <202306261208.35QC8J0R082770@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: c6f7abeaeb5b - stable/13 - net80211: define mask for ss_flags rather than using hardcoded 0xfff 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: c6f7abeaeb5ba9754799c4ff2129a4c49056448d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c6f7abeaeb5ba9754799c4ff2129a4c49056448d commit c6f7abeaeb5ba9754799c4ff2129a4c49056448d Author: Bjoern A. Zeeb AuthorDate: 2023-03-14 21:00:48 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-06-26 08:29:22 +0000 net80211: define mask for ss_flags rather than using hardcoded 0xfff scan state ss_flags in two places cut off the "internal" GOTPICK options. Replace the hardcoded 0xfff with a defined mask. Note that "internal" flags is confusing as we also supplement the the 16bit by another 16bit of "internal flags" passed around but comaparing to GOTPICK never stored to my understanding. No functional change. Sponsored by: The FreeBSD Foundation Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D38832 (cherry picked from commit 3346164ce844f8995311c3988ab193bd6ddda0c9) --- sys/net80211/ieee80211_scan.h | 1 + sys/net80211/ieee80211_scan_sw.c | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/net80211/ieee80211_scan.h b/sys/net80211/ieee80211_scan.h index 609339ae77e8..32330322ce33 100644 --- a/sys/net80211/ieee80211_scan.h +++ b/sys/net80211/ieee80211_scan.h @@ -136,6 +136,7 @@ struct ieee80211_scan_state { #define IEEE80211_SCAN_ONCE 0x0010 /* do one complete pass */ #define IEEE80211_SCAN_NOBCAST 0x0020 /* no broadcast probe req */ #define IEEE80211_SCAN_NOJOIN 0x0040 /* no auto-sequencing */ +#define IEEE80211_SCAN_PUBLIC_MASK 0x0fff /* top 4 bits for internal use */ #define IEEE80211_SCAN_GOTPICK 0x1000 /* got candidate, can stop */ uint8_t ss_nssid; /* # ssid's to probe/match */ struct ieee80211_scan_ssid ss_ssid[IEEE80211_SCAN_MAX_SSID]; diff --git a/sys/net80211/ieee80211_scan_sw.c b/sys/net80211/ieee80211_scan_sw.c index 4c184095ad35..f72f4658ad67 100644 --- a/sys/net80211/ieee80211_scan_sw.c +++ b/sys/net80211/ieee80211_scan_sw.c @@ -195,8 +195,7 @@ ieee80211_swscan_start_scan_locked(const struct ieee80211_scanner *scan, if ((flags & IEEE80211_SCAN_NOSSID) == 0) ieee80211_scan_copy_ssid(vap, ss, nssid, ssids); - /* NB: top 4 bits for internal use */ - ss->ss_flags = flags & 0xfff; + ss->ss_flags = flags & IEEE80211_SCAN_PUBLIC_MASK; if (ss->ss_flags & IEEE80211_SCAN_ACTIVE) vap->iv_stats.is_scan_active++; else @@ -306,7 +305,7 @@ ieee80211_swscan_check_scan(const struct ieee80211_scanner *scan, ic->ic_flags |= IEEE80211_F_SCAN; /* NB: need to use supplied flags in check */ - ss->ss_flags = flags & 0xff; + ss->ss_flags = flags & IEEE80211_SCAN_PUBLIC_MASK; result = ss->ss_ops->scan_end(ss, vap); ic->ic_flags &= ~IEEE80211_F_SCAN;