From nobody Mon Jun 29 06:34:37 2026 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 4gpc2Q0K2Yz6k5jW for ; Mon, 29 Jun 2026 06:34:38 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpc2P5gNVz4H8H for ; Mon, 29 Jun 2026 06:34:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782714877; 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=ZLXpnvD919QvsdVt4D+ZIY5qi7c6DmbZWbq7DMEsDqM=; b=k/jDA43+saW1B00NskdKsQ0MvBlNmOI5g01ZFr6VYy37hMQ16orCkN203C+Q5/r18o3NN+ G0/1W1qvr5AptlNMGqHnf+nvEMU2JamA8VEXaW1y14JZNbS1BeZAKKsMhD4CHPJz4iUuGW 3VCdAvwj6+vbeUWwNYPgQU7ZFjZt7YhoGB9NQzD1wh4M62abfLxRqp3Q8orZHO8dEsqwBc OgsoRaP3EdYkKxHIvBGvt6w9g838GHuR4zAfnpotcUyVfvJ1U4UaZ2yY/UIAyIDqohpfKu 2rReUEtkOAii79zKzszrl4CqWryA/eIaNiQBNmukeY5AY0siANfKZtdUAHf7NA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782714877; a=rsa-sha256; cv=none; b=IQ1mm3T3c4b3CfRmGXumnotn6CMbr8R5FJ0wastp0+ZsCFUX3PTfbqom6e7qApQAWPGVPa JhY3H5BVo8s7jioRZpH+P556lw2Xy9vHpklGA2+KOV3pg8C5sSqZxen05Ld9jQKeEM2JLb Uqr1nRvpCQBROaxmL+SqZe7Ak09/gmLKVpJR7/626/FSKKBK1uVDhrMnM8qtQddACk9nlh O9xo877uI8O49F9Lw9zwxyTiQWu2m/TapjCDyoYd3Qc766cv2QnOLhTneM5g9Q13doN+Sl KQwOnU9WcUvYV3zBtRK2pEwnUVsUuujCIDZ+x0vA1aZh3N6mGGSnHA6+hLNEjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782714877; 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=ZLXpnvD919QvsdVt4D+ZIY5qi7c6DmbZWbq7DMEsDqM=; b=YXhVXd8w9LbU5UZyN0WSVGdqRKLZcglPnMEA+XtZbZdv083C/k498kdogI/0u/Tv4NZwgd En3WCJuhb2bk3oYZ33fU46B+g5DnjBnseIkRNGlYYbZCkIMpBKCRALUVrw7CwboJkwZFBB RS2pjvv5r/slE5gGAsFXny2CLhqLnOEYhX5MCwT3kH9xcArnpAZhVzqUh9md3BC0Vysolb xnsvzOtPald1nHdC29itcm0qwDAUicEioii/KiEshcSQUAmnVbo/YYEAjrrYLbbJlKX9SV VVnDxI8BsPeiHS7hetzdL1AbRHgmv7pMScbtKlNBb+sIpi9uF9rjZeDTxvTozQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpc2P4TtfzmkH for ; Mon, 29 Jun 2026 06:34:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 449dc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Jun 2026 06:34:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 848cb6b184fa - stable/15 - LinuxKPI: 802.11: add 11g check to lkpi_ic_getradiocaps() 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/15 X-Git-Reftype: branch X-Git-Commit: 848cb6b184fab91315710ec755f31455684f3ecf Auto-Submitted: auto-generated Date: Mon, 29 Jun 2026 06:34:37 +0000 Message-Id: <6a4211fd.449dc.563a78de@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=848cb6b184fab91315710ec755f31455684f3ecf commit 848cb6b184fab91315710ec755f31455684f3ecf Author: Bjoern A. Zeeb AuthorDate: 2026-06-22 00:10:22 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-06-29 03:54:33 +0000 LinuxKPI: 802.11: add 11g check to lkpi_ic_getradiocaps() Replace an early comment with code and add a (simplified) 11g check. We make use of the annotated bitrate flags we added (see lkpi_wiphy_band_annotate()) and check if on the 2GHz band there are any bitrates which are 11g. Upon the first one found we do set the IEEE80211_MODE_11G to announce to net80211 that the 2.4Ghz channels may operate on 11g as well. Sponsored by: The FreeBSD Foundation (cherry picked from commit d4a529ad0d5638ad3e8d27815948b0a7c4628e3f) --- sys/compat/linuxkpi/common/src/linux_80211.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index f1ed22efb2e9..24819a970431 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -6726,18 +6726,28 @@ lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan, if (hw->wiphy->bands[NL80211_BAND_2GHZ] != NULL) nchans = hw->wiphy->bands[NL80211_BAND_2GHZ]->n_channels; if (nchans > 0) { + struct ieee80211_supported_band *supband; + memset(bands, 0, sizeof(bands)); chan_flags = 0; setbit(bands, IEEE80211_MODE_11B); - /* XXX-BZ unclear how to check for 11g. */ + + /* Check for 11g (simplified). */ + supband = hw->wiphy->bands[NL80211_BAND_2GHZ]; + for (i = 0; i < supband->n_bitrates; i++) { + if ((supband->bitrates[i].flags & + IEEE80211_RATE_MANDATORY_G) != 0) { + setbit(bands, IEEE80211_MODE_11G); + break; + } + } IMPROVE("the bitrates may have flags?"); - setbit(bands, IEEE80211_MODE_11G); lkpi_ic_getradiocaps_ht(ic, hw, bands, &chan_flags, NL80211_BAND_2GHZ); - channels = hw->wiphy->bands[NL80211_BAND_2GHZ]->channels; + channels = supband->channels; for (i = 0; i < nchans && *n < maxchan; i++) { uint32_t nflags = 0; int cflags = chan_flags;