From nobody Sun Feb 23 00:38:53 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 4Z0lNZ2ZyVz5p28J; Sun, 23 Feb 2025 00:38:54 +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 4Z0lNZ0YSKz42HT; Sun, 23 Feb 2025 00:38:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740271134; 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=jAXhwiqNs2yFdOgiKFOqk6jDJL0e7NjWkwFNW7mPNLM=; b=VFZ3XK4wsEkwSrxvHb8DPU7LUrHL0QloyLXoOuRRU2NBU5ceiKKTQ80InnBnCbefB8LL4e lrNS2WcObe/FQmGAhwHNgx2ccGxz6uICOfuv3gSTinGDM3fFHI1vmUHakE5NIysUA5ghbC xxk8PDBBKq7pder7x9Af18S3ApmkJ5+DFlfP6yf/pMTPh9MBIGAtZnBERM6ZA0spyZ7J8C cA9gr8gDuU5Vv6GJ7/opyGS4B2Q4F2PbjI++Scw+0aquDAwwi29B8JFUq8CRWfPn3jjIJk /bLFze7ooKBx8X51eLhGL9dW3CxTnkGQjJIA5dnQdPkjqxaLvOL74Yn2uTjGLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740271134; a=rsa-sha256; cv=none; b=InJSH6us+MJw3W105JCLio8v8peQPB7xpfMwuWah04pU2pg5xGXtUER2HJzJinTuh/1MuR nAMEhQstgg1u8jJh9C3aQX82U3372zPjYA94POnhCR2l+sCW/ZiMpWF0THZHRAY+pQt+P9 eGu3Amp7X967rWeTGSRVqiHC0heusp1yUZaWYEo4/y5bfg2StkLVYYmmBXStAymcVyiL89 88VzU5JQ7FgBA5OO7l7esDN/RjISIyXXs4ctklJlB4+jb1u4dijyV8LEcDg8JIyYyogYq+ KfHYd7JByjPjW/TF1ZxBfjm8PpN+d8monZ5gJ6R81FbhUQrfUI2np0DWJLtShg== 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=1740271134; 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=jAXhwiqNs2yFdOgiKFOqk6jDJL0e7NjWkwFNW7mPNLM=; b=Frhtb++YS7BbKxSXRl6ekazSQhhPkzlqaliqRYbfbR6sy1HDN2z9X1zDXRG3rbYQ/HYPDt 02tW3AwecqDz3+/Y02/elj6ksd6iNnsCAJZjQYt9+Ea/Rasa6obg8DSKio4bwRMcYQUZaU dMd+H60Bb45mX73nLw1KLvUs54acVgDGINtWv+4I8omUwHGpNUvhAQP5p4qi/ng5HlcCHr nl8dJw/rnHaHOqsjqfuh3RPS5qTQTT7Jq8ZFMauZmQtsytrpMvNYGWKq5tVZ+TJb9rzZHi m7qfduYKgdIdFWUV4mP8ck5JgH026cQK2jIA54194itpm9tnUQzSZaOMbHol9g== 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 4Z0lNY6yvszXTT; Sun, 23 Feb 2025 00:38:53 +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 51N0crvH014498; Sun, 23 Feb 2025 00:38:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51N0crBq014495; Sun, 23 Feb 2025 00:38:53 GMT (envelope-from git) Date: Sun, 23 Feb 2025 00:38:53 GMT Message-Id: <202502230038.51N0crBq014495@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: 73cd1c5d44ea - main - 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/main X-Git-Reftype: branch X-Git-Commit: 73cd1c5d44ead3b84cebcc0c24278429afa9e6ec Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=73cd1c5d44ead3b84cebcc0c24278429afa9e6ec commit 73cd1c5d44ead3b84cebcc0c24278429afa9e6ec Author: Bjoern A. Zeeb AuthorDate: 2024-12-30 06:35:03 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-22 23:16:25 +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 MFC after: 3 days --- 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 041789857f0d..62d29feabb09 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; + } } }