From nobody Wed Feb 26 15:03:11 2025 X-Original-To: dev-commits-src-all@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 4Z2yQR3vkNz5qFhc; Wed, 26 Feb 2025 15:03:11 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z2yQR1l6sz3GSd; Wed, 26 Feb 2025 15:03:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740582191; 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=vYOFYpmbf0/4dCiBXEqlmk2bL5ZgThqAnSppIGUz68s=; b=XG1q8Il2+FuYWwWsN3CbmUVDMbiMRCAaw7a/idVp5lbLzq+rTHDrEKBw0jOhFd1tLvFXCX do2I/UREY7i4szE6n8U+ZOrLpEsHUrn0u0VUusEvR1B7BkZva4zj8PtsGEMrvjCvnlGOCl DJ+wGWDx+gTJTu51aQVeszG0eXbm7npMXwUFbJYk6OagF7AT2QWbCbK76tsCU3TMqhUrAU ZBK0MpRHQK+txCVBq2/cMTaCwM05c6jJX/8q4XeMkR9GlHnolkcJS84yrVmk8iV/5xO3Tq TBR7Eh+Pbrvg7s+ZsclHr4oLdlm20QL5n0EXTUh4CpuB61rrdMm66TW0MngXPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740582191; a=rsa-sha256; cv=none; b=IMJN727rIb2Io37RQ59ZF+eAs1oBZEoYNNGtFO5MJvHdI8RlQg73yxkwok1Rgeg18QrXJD jIzRlXJcIT7kJ3A8PTZHYsKhzGud4l+lI7nTHrjXR/yBqVu3c9Qj+qGscwkK4f9LM5t28I FESwFbxDCxNrAcX40JGIiVS7f6yEsJqM7ahIxZBh4h//bnV9MYaU+kAq3VCSE/dM11cj8Z qVNwv9ajwJYrGPF1IEorA5/vXTbL4kzt3MMlhO5W78aJobWCfng6BYNOU+HYmVm+wRJbVd jMtCQ82ZnCs8PnJXUURM463YO1RI2T2/dqxLBzP4J8NUaxs5dqV/0BM0XfDeAw== 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=1740582191; 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=vYOFYpmbf0/4dCiBXEqlmk2bL5ZgThqAnSppIGUz68s=; b=pnGAaJ9CdiDb3lWFwQX9oRjTq1w5t9JKs48Zsn3ii0CfAghUubgjawzOZd52WhxNwwJSrM 1r5jrADnPPh8gO9q3yUghU32r7+nOPU3NRVwRSXF42ZBmr514VhnIwTi80RTOuLqpLnpTD BJykT2N4hBhvGF/1INB9+k/IwW0KoF87DK//Uo6mbIPZ0s0EXW9l5Iw+P3C8u2xBirXVnx 0gJ6cWb7+ekbjoeywfZ0fNNFY1+kp5fMK5N7YTmLSLoVPY+qaXwkLL1iCzucI4WZKyfKqL 42Ah0gXZEqntqG098y8iUTgEkUK8o+cev55qQuS7d0GnrQ+b6ymo8rMBd3yFTA== 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 4Z2yQR1K29z1Gx1; Wed, 26 Feb 2025 15:03:11 +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 51QF3BNt014529; Wed, 26 Feb 2025 15:03:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51QF3BbW014526; Wed, 26 Feb 2025 15:03:11 GMT (envelope-from git) Date: Wed, 26 Feb 2025 15:03:11 GMT Message-Id: <202502261503.51QF3BbW014526@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: 2b93e1f9bafd - stable/14 - LinuxKPI: 802.11: add further checks for deflink.supp_rates[] List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 2b93e1f9bafde3be0a493e5289cc1c6b8286ab1a Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=2b93e1f9bafde3be0a493e5289cc1c6b8286ab1a commit 2b93e1f9bafde3be0a493e5289cc1c6b8286ab1a Author: Bjoern A. Zeeb AuthorDate: 2024-12-30 06:35:03 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-26 02:39:23 +0000 LinuxKPI: 802.11: add further checks for deflink.supp_rates[] When setting the per-band supp_rates bitfield check for mandatory rates only. We cannot easily say at that point for 2Ghz whether 11g is supported so assume these days it is not pure-b. Sponsored by: The FreeBSD Foundation (cherry picked from commit 73cd1c5d44ead3b84cebcc0c24278429afa9e6ec) --- sys/compat/linuxkpi/common/src/linux_80211.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 455b86284a7a..1255691ccf70 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -550,10 +550,30 @@ lkpi_lsta_alloc(struct ieee80211vap *vap, const uint8_t mac[IEEE80211_ADDR_LEN], continue; for (i = 0; i < supband->n_bitrates; i++) { - - IMPROVE("Further supband->bitrates[i]* checks?"); - /* or should we get them from the ni? */ - sta->deflink.supp_rates[band] |= BIT(i); + switch (band) { + case NL80211_BAND_2GHZ: + switch (supband->bitrates[i].bitrate) { + case 240: /* 11g only */ + case 120: /* 11g only */ + case 110: + case 60: /* 11g only */ + case 55: + case 20: + case 10: + sta->deflink.supp_rates[band] |= BIT(i); + break; + } + break; + case NL80211_BAND_5GHZ: + switch (supband->bitrates[i].bitrate) { + case 240: + case 120: + case 60: + sta->deflink.supp_rates[band] |= BIT(i); + break; + } + break; + } } }