From nobody Wed Jun 11 09:14:16 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 4bHKjN5SVKz600FM; Wed, 11 Jun 2025 09:14:16 +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 4bHKjN2gD0z3lRW; Wed, 11 Jun 2025 09:14:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749633256; 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=VqL6+isrrBDYC9EFXW/eYxtfB+880RhBrUOQnQ1ihNE=; b=aJwxFkQZtnfgauTnXlegrEiKb9cjj51whgf/4Z4DIJauF14yW0fnvkkXT8nxUYfsgFksts TN0Bv6H39kwmuRKY3BM0oLjLZN6f5BbqDJEFlIFtghIDk5Hm/MaPgig/1NA1gWK24pcGGe UgPoeMLlJRF+ezonROHoQkF8aZpF3NMbu5ebEiStCscfjpiSOttJ8575fm0nMHoHX2gslG /u+1mUtZDs+OvObhd/PEP4qerIlv+guvcLUmTTfbyVimMXLC/+oZ8OMdrAmO+mX/d9+Iv4 8AEm6Gw3tBZMjcGE306NiafX0lLTRJQGT0UAonPVhIEOsYejKGwxJKeHBFPsnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749633256; 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=VqL6+isrrBDYC9EFXW/eYxtfB+880RhBrUOQnQ1ihNE=; b=i+iTBj5opEzuGHxREHxYzZIjhxojpJlRifpqdKxLchekpsUociCSCSTeobMVvQp/W3hyVf pbp+mnhZRORM38ncDnY5sOTcDlzu6S5yMKtI6Bxmz+HUoU38M1ysys/ptYzsBKTQST1usd X0Ro/w7Dl2k/9n722vI1gBG4v6R00u0KOq3t0fT+WEo/I/tv9UBZp+BvE1sbKvWJXbBdFX 8o1XqtBaDLq88mgYelAnpL6rJ+EedJphnVxbLwp7b7dZkxPUsOxuS3vLujDYBrPN/LC1Gi W320UTFBM1cIaLeXyMF+lALBqLQontRFbqSYvbqfx/gVqJydethGxRTns5T9mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749633256; a=rsa-sha256; cv=none; b=k+MEqxLWNx2D57YADJZ4xOyhp/iV0ewcMPPnfjX4wdvswJhVxG+L6tj8Rb/+PZnHbY6ss7 P6EQjvD7n8SxA/fFcjml41TpUDQkYCpFAuJT7X9/w3r4uXIps6nred9w4tNvtnrnNkrEi/ VVUpeujz36Go+yZKmvkJXhBZCGxwflDwuYMO/32t5jZbPwTbhDZVCnv+9DFpj/nzHBExn6 4OkZ6sotTl/Fllo8cnf882zTDI37rcXShhKqrsNs/pOrBRK5PaJX0vi8Jh7fHtHv1DNszM 9Sa1wOUS0z1zb3o962+KyLKycUYz4ZF24f4d8EgQzhqrUwqjKsJ/AGItPhGxPA== 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 4bHKjN1mC8z5VL; Wed, 11 Jun 2025 09:14:16 +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 55B9EGPv061977; Wed, 11 Jun 2025 09:14:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55B9EG8j061974; Wed, 11 Jun 2025 09:14:16 GMT (envelope-from git) Date: Wed, 11 Jun 2025 09:14:16 GMT Message-Id: <202506110914.55B9EG8j061974@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: 5d1d86b3dd4d - stable/14 - LinuxKPI: 802.11: make synching from HT more resilient 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: 5d1d86b3dd4dfc48d14c5af74270a97a26d71a95 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5d1d86b3dd4dfc48d14c5af74270a97a26d71a95 commit 5d1d86b3dd4dfc48d14c5af74270a97a26d71a95 Author: Bjoern A. Zeeb AuthorDate: 2025-05-27 19:33:13 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-06-10 23:38:18 +0000 LinuxKPI: 802.11: make synching from HT more resilient During testing I hit a case where htcap->mcs.rx_mask[0,1] were zero. This should not happen as that would mean we are not supporting HT. After adding extra caution for debugging I could no longer reproduce the case. So just to deal with the eventuality make synching from HT more resilient by checking that we have nss > 0 or otherwise disable HT operations. Move setting the bandwidth below this check to not alter it in case of the now early return. Sponsored by: The FreeBSD Foundation (cherry picked from commit 58dae28f665b32650f452730378693de40e96d68) --- sys/compat/linuxkpi/common/src/linux_80211.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index ffa1c1f23339..6e65b49fb81b 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -482,12 +482,6 @@ lkpi_sta_sync_ht_from_ni(struct ieee80211_vif *vif, struct ieee80211_sta *sta, sta->deflink.ht_cap.cap = htcap->cap_info; sta->deflink.ht_cap.mcs = htcap->mcs; - if ((sta->deflink.ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40) != 0 && - IEEE80211_IS_CHAN_HT40(ni->ni_chan)) - sta->deflink.bandwidth = IEEE80211_STA_RX_BW_40; - else - sta->deflink.bandwidth = IEEE80211_STA_RX_BW_20; - /* * 802.11n-2009 20.6 Parameters for HT MCSs gives the mandatory/ * optional MCS for Nss=1..4. We need to check the first four @@ -496,11 +490,21 @@ lkpi_sta_sync_ht_from_ni(struct ieee80211_vif *vif, struct ieee80211_sta *sta, */ rx_nss = 0; for (i = 0; i < 4; i++) { - if (htcap->mcs.rx_mask[i]) + if (htcap->mcs.rx_mask[i] != 0) rx_nss++; } - if (rx_nss > 0) + if (rx_nss > 0) { sta->deflink.rx_nss = rx_nss; + } else { + sta->deflink.ht_cap.ht_supported = false; + return; + } + + if ((sta->deflink.ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40) != 0 && + IEEE80211_IS_CHAN_HT40(ni->ni_chan)) + sta->deflink.bandwidth = IEEE80211_STA_RX_BW_40; + else + sta->deflink.bandwidth = IEEE80211_STA_RX_BW_20; IMPROVE("sta->wme");