From nobody Mon Aug 25 09:54:09 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 4c9R2n4ZWmz65WmF; Mon, 25 Aug 2025 09:54:09 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c9R2n3nrXz3wvt; Mon, 25 Aug 2025 09:54:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756115649; 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=ge+MsSQ8LK1M4kewJr/+wqFPOAGPuHKovzKCPzXNj+E=; b=bQ9KT50AxbXozYx7gWnpQmHMfM1FwJunAHbw86+OcPaICdAw27DK4STXkg7Wf0JgYRc63v OyVNjKGMZ5jGm5422IEDsLFuVXCS850cNGSrDTkIf9XJUupDBMa4ZODCU+X9B1+HgB8iMO RQpuLIpC0B13gVMw2lh3qbLqS8E/nb14PS7DSOKxak77PLzQh8wrR5aIpfnxSQ7Hs8GelD pjRpgk/03lS9ZNt/cOENOUOh6dhoRa5fN2jAKV58QeYDcy+wudpRZyYaXWdpyUGRneckgi uSjbLGFhS48mBIZCMGNfJN3OwpVQ8gxpzJ8SceaoMKKsQynKzRvs8+L6MfTfJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756115649; 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=ge+MsSQ8LK1M4kewJr/+wqFPOAGPuHKovzKCPzXNj+E=; b=puDMV9cEOkgR7PpgvsGJyIpNG2HeqQQ7Gk7y8MUPLfh3VTrZw4+7tYQBhzaWr8QSB7Oyo5 KC+37+vGCTBKFTLWw7Gu9+lwUpfUBzNA9zM+vJ85/bPf9omSeYSPiDJVCtZy6Br4bp+Kc8 3qwoCPH5c0Ch0/8TGHcfArhWf1Ab/+Y8oKufGoFJeadQuj3qQnge2Q0r5CwoSrUCoL9PZm 8K/OjcFD/zpv2D9IITW4wZ/hlG+r2C555gp+r3sbdfM3vdxuWsNBtl/NThil3/sgXX8b28 0Em0892SM03prqR0bnpPpGAmzHbxTva5yMagWf43xH/ZAkCpDVKnSX/+nw/Sbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756115649; a=rsa-sha256; cv=none; b=wz13BbGbrp32uCXH30XiMzcnXXq4znxOBWka4ecNLbn9X8sRW0D685eka7MPrh5FdWkkCG adYiUqkg+sKK2ERmE99CjmfriY+eo6ZRY7NotkEYJeU/L8idpBanhOlAh614+HZykVJ0wI 8YxP+ymTxCuklB2YYIcFvlJu/hb+EtPUMObfHQjdFKoR9yvtsz+37T1qgH5YhfjqU3jgVj /XxH9syO6KvBCXkLeFA4gOq9XWJlrgAghJObPtNwmbzGPhaqfgFA9BNOCrlVw6cBEn/8GY VS0YwNrdTbil2i9DCjLvvoZYLoNZSoulZXaT1gpr1/Yze5FezHC6XBoozrPnjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c9R2n3MgRzlKQ; Mon, 25 Aug 2025 09:54:09 +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 57P9s9BD029704; Mon, 25 Aug 2025 09:54:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57P9s9Cc029701; Mon, 25 Aug 2025 09:54:09 GMT (envelope-from git) Date: Mon, 25 Aug 2025 09:54:09 GMT Message-Id: <202508250954.57P9s9Cc029701@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: aa2989738ab1 - main - LinuxKPI: 802.11: stop using hw_value on a channel 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: aa2989738ab1f1dae55702e2bf1d853f6fdcfdd0 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=aa2989738ab1f1dae55702e2bf1d853f6fdcfdd0 commit aa2989738ab1f1dae55702e2bf1d853f6fdcfdd0 Author: Bjoern A. Zeeb AuthorDate: 2025-06-22 07:33:04 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-08-25 09:54:03 +0000 LinuxKPI: 802.11: stop using hw_value on a channel During initial LinuxKPI 802.11 bringup looking at the usage in one driver I started using hw_value as an equivalent for ic_ieee. That is not correct. Remove all usage but logging of hw_value from LinuxKPI 802.11 code and leave the field to the drivers. We have to go through some hoops to get the needed ic_ieee value but so be it. At some point we may want to clear this up in net80211 (especially given we'll have to handle more per-band data in the future). Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 500c1c1d52eb..903061117fc3 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -1179,7 +1179,7 @@ lkpi_find_lkpi80211_chan(struct lkpi_hw *lhw, channels = hw->wiphy->bands[band]->channels; for (i = 0; i < nchans; i++) { - if (channels[i].hw_value == c->ic_ieee) + if (channels[i].center_freq == c->ic_freq) return (&channels[i]); } @@ -4371,7 +4371,6 @@ sw_scan: struct ieee80211_channel *c; c = ss->ss_chans[ss->ss_next + i]; - lc->hw_value = c->ic_ieee; lc->center_freq = c->ic_freq; /* XXX */ /* lc->flags */ lc->band = lkpi_net80211_chan_to_nl80211_band(c); @@ -4400,7 +4399,6 @@ sw_scan: } } #endif - hw_req->req.n_ssids = ssid_count; if (hw_req->req.n_ssids > 0) { ssids = (struct cfg80211_ssid *)lc; @@ -5839,8 +5837,9 @@ lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan, cflags &= ~NET80211_CBW_FLAG_HT40; error = ieee80211_add_channel_cbw(c, maxchan, n, - channels[i].hw_value, channels[i].center_freq, - channels[i].max_power, + ieee80211_mhz2ieee(channels[i].center_freq, + lkpi_nl80211_band_to_net80211_band(channels[i].band)), + channels[i].center_freq, channels[i].max_power, nflags, bands, cflags); /* net80211::ENOBUFS: *n >= maxchans */ if (error != 0 && error != ENOBUFS) @@ -5911,8 +5910,9 @@ lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan, cflags &= ~NET80211_CBW_FLAG_HT40; error = ieee80211_add_channel_cbw(c, maxchan, n, - channels[i].hw_value, channels[i].center_freq, - channels[i].max_power, + ieee80211_mhz2ieee(channels[i].center_freq, + lkpi_nl80211_band_to_net80211_band(channels[i].band)), + channels[i].center_freq, channels[i].max_power, nflags, bands, cflags); /* net80211::ENOBUFS: *n >= maxchans */ if (error != 0 && error != ENOBUFS)