From nobody Thu Jun 5 14:34:07 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 4bCn5C6VX1z5xvR6; Thu, 05 Jun 2025 14:34:07 +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 4bCn5C632Nz3X4L; Thu, 05 Jun 2025 14:34:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749134047; 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=+T6/sLNkxXqH0PaNGg+kVlenlduAI6f1GRkkzY5ruWE=; b=O2KgPF6wYKT3C6p73t0Cjd5ac/ngDw2Oc5Od6UXlOeW6LGRld7QURlyhCyo/wpxphtEg/T DTR0H+BQ70c9MBEkQglYenFl5YWjWH2CFU3kctKd7aGvY1xsZlToXR7rzzfrE+VogdhauR cS0FU6ErHxuC+ZmSlH5gNcQGv+Wp9qOdBaxNMAIbrMdY7EIKEGz/46onhhG9ucBrCHDn92 kuLgIl6D04AxpAFd1K3cS4rJ5uJkSQrhQrjXe4CUf3RnMFDYGM/Ar0sY1DoKjp7j6Lgs1p oEZNUMqG0BmFRAg/wWK6Azk+NfJY8YXH7TZ4lES98If4d5iQPznn2JfHTvetSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749134047; 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=+T6/sLNkxXqH0PaNGg+kVlenlduAI6f1GRkkzY5ruWE=; b=m2W+A0rW0x+1+Eey5V1d3SZgaHwAVReQo+7hlhQ+JtQVeSxTLCh37EPcsj47m4691AjAMr 1eTZkzUwoH3nQH8ewScO0Fpp9G2P1BWGh4m622m1bgct7gcJEfyjBjAjv3rB2lm5DTE6Mh GV8xwuxvPb5cTTNN5uG2VpWui/U0yOxH4+KYjNsAhWKdvop9yI28+QYG/A/QejS5VKx8S3 Ea6stttrYG9/B4K3kCRSRkidgXWW1ReGmPaJUUfAz8HgKhnXOtnhhbWrMkVNxdE67LowWW aG1ubfjyOQySMyTbpF/WM0oQSYaLJV1T06lMqpf8o6xesRkKXSZe95WqiPfHLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749134047; a=rsa-sha256; cv=none; b=lMFuSazerkjj4a61T7F8iyGCpWszBWaU8t3FKRZV8PhOeaycxcfpwS5EH/4Jz3RtvVjWUX DwkI0oJF8KoB7Unz0DvEVK9ceTAUkcyywO/GkhvG61zTcWc8ib8O4s1TlB33F9eKQfnEkN OQwJppqCkKe+C3PfvvWae/xk7t/YykQdbsOIFNKth7sR25IYgtc8V2ol2rp4HDpEA47afR 2lJZdg/Za/fC59AVwUnwKDMyRFlQgUciIvLH+Ja5Knk96+vp8UgPx4qEF7g94ZwbK7DKOs v5xAKfPH+MAzh8NdFpALslk/SKOs9yKu0QKhhKgUAn0BGGfIF7o2n9W+ZTBF4A== 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 4bCn5C5cjYz1C00; Thu, 05 Jun 2025 14:34:07 +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 555EY79B056698; Thu, 5 Jun 2025 14:34:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 555EY76i056695; Thu, 5 Jun 2025 14:34:07 GMT (envelope-from git) Date: Thu, 5 Jun 2025 14:34:07 GMT Message-Id: <202506051434.555EY76i056695@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: 58dae28f665b - main - LinuxKPI: 802.11: make synching from HT more resilient 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: 58dae28f665b32650f452730378693de40e96d68 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=58dae28f665b32650f452730378693de40e96d68 commit 58dae28f665b32650f452730378693de40e96d68 Author: Bjoern A. Zeeb AuthorDate: 2025-05-27 19:33:13 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-06-05 11:32:27 +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 MFC after: 3 days --- 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 d424bb6c8d44..390b27802fc4 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");