From nobody Fri Jun 6 16:29:39 2025 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 4bDRc41ckKz5xd8T; Fri, 06 Jun 2025 16:29: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bDRc33VTvz3NSm; Fri, 06 Jun 2025 16:29:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749227379; 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=kT7QBlfowFh5FLIQdpQHtzKy0QQa3WeLOSswsJQAwk4=; b=RoPSLjumvi9GKW2B7vV5SdcqwuRKE2cBI9so6C8ITPHeTxnA5h16v6qv/JrikLpEwhYmIz AP9liAbMfvrsp04E91ryS1UPao21Me4bpNb5tunUiEC9chOflT+Wc59pOL04Ki0FdOwdoC 5q4mp5ECecBzwBIUJAN2CFROwHoxNV2uCoEPgfnabCEPdktPNggnCQTLaPVTQAbJXcIDna 6riiT//sU90SCRLjFzq4HbnJfs2kfSupvqxYIFUp23IHoFb5zgJ5sh9V2H7AHGlOf86W2J pJREE0xF/hPVs7duQXokeFAYQ52VP0sfE3cukIcMmSpTexjsPmrKQm+w4PBSgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749227379; 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=kT7QBlfowFh5FLIQdpQHtzKy0QQa3WeLOSswsJQAwk4=; b=TpVwUCdyVZnaLEszzNIw+xFllaLdzn/DnxxccUKn1TSFZwyyaZrdTFdvR8uQBtz3bTg6A/ V3C1d3qZawYGY0ndeymESZadFS/jLlYepvnI7xVgO+Cmy9Pl2SClcq/3Hs9zz5728Kd3AU r6aG34XTq67Wcg2yzMTGhj7Wf1oBcnc9/RENkxVIefc10692K0rKYdKshuD6gShY7AwUit ZmhWJbseoevQnXshxeZtgZzRB032hxGiGG+KDD2pgAee3D23ma5YbrF9/H13bG2G2ffx+a zxTY9TfTvLz/KvrYVlabaVVCG1szEg2QRWrzQgiC8JIZJ2W9u3eUu8qUd44EpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749227379; a=rsa-sha256; cv=none; b=MyrJ7wWpRLp9n+JRJyNR7vMUPhsmTVjxTX0BCd8qw+hsTQPfIVRdmBty50+9mUF0loRgT3 L/oZeHppOAIP7cVLlSSAAkJEZPpQdY4xTSm+6WHEM6gFe542ymuM6vquV/gNvHSA9KUDhy OcewEF7eW7GSVs6qFFaVm/NHOQVgHxW3+COr45hhPVlvS9oW6qBhRUn41XryfMN61D6lmT vmryNJA+dwkAC1h4ER6uPId/poG0X782AVeAX2pIhpPAx4l6zsyaoy1KK2ZvkMZPjjTP0f 4DxW68pNb1RtF01vDc+8CapGHhMXRehoPq9wHtWYkbPWEyV7MdFtbCZoqeZ87g== 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 4bDRc332x6z12Zn; Fri, 06 Jun 2025 16:29:39 +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 556GTd17067588; Fri, 6 Jun 2025 16:29:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 556GTd9n067585; Fri, 6 Jun 2025 16:29:39 GMT (envelope-from git) Date: Fri, 6 Jun 2025 16:29:39 GMT Message-Id: <202506061629.556GTd9n067585@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: f1a110f1f0f2 - main - LinuxKPI: 802.11: fix lkpi_scan_ies_add() channel lookup 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: f1a110f1f0f2ef83758f7d0a984b14f512ea00fd Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f1a110f1f0f2ef83758f7d0a984b14f512ea00fd commit f1a110f1f0f2ef83758f7d0a984b14f512ea00fd Author: Bjoern A. Zeeb AuthorDate: 2025-06-05 21:53:35 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-06-06 16:27:59 +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 MFC after: 3 days --- 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 4c511eeba388..2721aa84b9fd 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; }