From nobody Wed Jun 11 09:14:27 2025 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 4bHKjc12fBz600Fn; Wed, 11 Jun 2025 09:14:28 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bHKjb5LWnz3m65; Wed, 11 Jun 2025 09:14:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749633267; 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=XgdX3qmSc5FlOcaK0Ty2uRSLrqCPern2nori6UxGWuU=; b=hCIRiOYHmGTDQZ3TNyoEhyFvcqkm6FaqlkMLN1PpR+KMCUcjK+yOLErl1waN4WtOXaI+Zg l9Gg+9CaS0x/amHrMuitsjS6T3ySE4N3BQOMKwdjPLHBASNmhTNJTDSJV+Q5sggSl6TznB ZlxGGnOT9wT7tKhwdlXKpaUyV45rY2NL7GhJYrVc88hQyAoY5xJ1ZcGM92iNCFmRRXh9Zx WGoSnQK5M/GgIaZG6qNxFaPaz50qm2VZAPso0sA13cIjl1wGXyOcNmxmAjelzHJj5OXUYN bVw5nREzeBb3rRxUIROHyJk7+ge8dqPoSB3S2RO/cN84LrFfnZwP1LqrgC237g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749633267; 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=XgdX3qmSc5FlOcaK0Ty2uRSLrqCPern2nori6UxGWuU=; b=V5/Lw51dKCes0TuqCaBdUXW6M4sw0g7/y8hgEoSaPFoIzqze4gnhy4+f2hjskVwjXGIug/ 5g8qNm2BjezVN743kPOd5ifkffnLhFAYiuDvLGj9oJ+UGQF25/QhEocIFaQfJU9T9FOJj1 q5tHiFyYTcTq9G1RD1+C+6ufc43KHmRFxJyFL8zMMXKB9tBH5LY6k4fIDK3OiY8mygkOEr HVOSA1a4cV68048a6fF2Ui5im/CmFyWyfm3llJVXiGQ2MEJqzoLA09sVYHTR3v82ZriSX1 XRDPzlEiAD07aQiHtOH+ZmRgD+r6AcF3EAsIFWMzVBM5xC0wpfCMchRaphd0KQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749633267; a=rsa-sha256; cv=none; b=Uqy1Tw/CaYYoGxOOWplkmV74+O8BWxkRlFRqDKp0a0S0N7Wu9gJ7enJVHOYytUcoB9e4FS bhh2JLhiSkFKUcfrRBlR2MdkBYbNSL/aqtlb2fkF+bdqUXUi4vUaGVEV1tytG6hHZ4y8v6 1+ylXXObbuSRT7bSDj+PRyU5RFn2/CQeKiW3bUrvE6pjuBMXlO/vX+jQoCUj+LVr+No7A5 iq7SeHpxB4J2KPIylLYsIh/eYx6IjifrxPBESitp/90YJU+IF7L7f7sU//LiigH5Qqv/AH w6otHhB0GY38kb3443bN2HhcNsp2DICfkv4z42dye8wwjBL8Bb24eHJ+3V7MVQ== 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 4bHKjb4D6hz52B; Wed, 11 Jun 2025 09:14:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55B9ERH3062349; Wed, 11 Jun 2025 09:14:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55B9ERkT062346; Wed, 11 Jun 2025 09:14:27 GMT (envelope-from git) Date: Wed, 11 Jun 2025 09:14:27 GMT Message-Id: <202506110914.55B9ERkT062346@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: 88d897ec1a95 - stable/14 - LinuxKPI: 802.11: fix lkpi_scan_ies_add() channel lookup 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 88d897ec1a957bb8be41e52495f9c32c56b38e96 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=88d897ec1a957bb8be41e52495f9c32c56b38e96 commit 88d897ec1a957bb8be41e52495f9c32c56b38e96 Author: Bjoern A. Zeeb AuthorDate: 2025-06-05 21:53:35 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-06-10 23:40:47 +0000 LinuxKPI: 802.11: fix lkpi_scan_ies_add() channel lookup When looking up the channel we may not get a result if no flags are passed in as net80211 channel list setup and lookup coding requires a matching flag (band). So pass in IEEE80211_CHAN_[AG] depending on band to increase the chances of finding a base channel and from that derive rates, etc. Sponsored by: The FreeBSD Foundation (cherry picked from commit f1a110f1f0f2ef83758f7d0a984b14f512ea00fd) --- sys/compat/linuxkpi/common/src/linux_80211.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 1b1e5721d7b2..1487e20bebc7 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -4118,12 +4118,26 @@ lkpi_scan_ies_add(uint8_t *p, struct ieee80211_scan_ies *scan_ies, channels = supband->channels; chan = NULL; for (i = 0; i < supband->n_channels; i++) { + uint32_t flags; if (channels[i].flags & IEEE80211_CHAN_DISABLED) continue; + flags = 0; + switch (band) { + case NL80211_BAND_2GHZ: + flags |= IEEE80211_CHAN_G; + break; + case NL80211_BAND_5GHZ: + flags |= IEEE80211_CHAN_A; + break; + default: + panic("%s:%d: unupported band %d\n", + __func__, __LINE__, band); + } + chan = ieee80211_find_channel(ic, - channels[i].center_freq, 0); + channels[i].center_freq, flags); if (chan != NULL) break; }