From nobody Fri Apr 18 14:37:15 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 4ZfHR068Fwz5stFM; Fri, 18 Apr 2025 14:37: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZfHR00z7vz3KbS; Fri, 18 Apr 2025 14:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744987036; 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=BLM4vnG1ydcpo3qq+xdmPw/AZ56/smUDeFNVgepx24g=; b=EpF1tLrx9F31G5Pi3525BvY/Or4R7DF0GLNqoO+ti2W3V2pzTGzBpcPwK89oQmILRtitba Jp3motL5AXvmj+U5LNcEp585bWWWfYqXasicK1GjUG2BzQkdYq2rYbQvX9mBMZUP/CMYF0 cwdxvjgDu8G5dA+cuVAmIAxiyYEvnUKvKmm7jUZo1KBaJeqPFL01cqUqzHyQePx4x9FyYC hcI9KfiyDn1arTaifDMAT9q1NWjl4jN5zFcywT4HD9g/7CVAJt/RZ5HIZJAcF9gan7GZKM j5zCl9bblRv19g6JCjhPkPkqnTM/4yb6kALy5B474dKkzgvZwJWMoKYAYr0yXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744987036; a=rsa-sha256; cv=none; b=OAmbpbn98LUF0qgU5dtDRgx6rMf5B17y59j6+TwDTD88x6MQSSSFwU2UwFYTzrXPI1m5XO 7ZGYP0qem7fJZX0IgjLL2SrV2KYmNavoxgdXeACcQLGWUtF7B5vSQz/3JSjdyvogCMHFBJ QhPAX1H8Op1BWAHlTScqRtiViWIQ1HPGH6nYXCFut4B1YOstdQ92I+NDgq6AgSONlrVPG+ VCgrEqHnBHhwg8Mm1Vg6L5J/jZ+58yiDBA6z8h98iLXE8zLwmmAc1rE2tqRofnNdrj9Jse 2NZby0s7notiVpqeIUQPvQhP77dQZ8mdm9P5FmorEEfz3LvwqnEtIqVwAW+/9Q== 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=1744987036; 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=BLM4vnG1ydcpo3qq+xdmPw/AZ56/smUDeFNVgepx24g=; b=pSG0e5RbqrO5NIZmQ7swEl7g5DfvGXnqe+lbO/SwQ5UGaQGJSJtlPDpdMoN6md/k8vD+gY luj/AKUDMF35FFDSihhGIaoLZD1Wji6rHdtKomM2/5CZlG3/EVnb8zgnihdoaUswT3gvNJ o2qln59X4rNIyVl1znIGKtjFJJbI53UDo9pdHkumVJjVIUZwA6KCxrEKkaSczKyfkzQmBY 4+Zu5BdmBa4GMx6vrNZVSu3vxhB7ulVDYvQt3jjp9ZD7LDS4koNmOhJ6RAjGFEfk5rJSzf wRNE7vypTo2zAXGNjallfKnrOgYlcudsM8sZbNG35HMsx8tkBiPcvJoswkmtYw== 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 4ZfHR00BXBzfHK; Fri, 18 Apr 2025 14:37: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 53IEbF3D091909; Fri, 18 Apr 2025 14:37:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53IEbFtZ091906; Fri, 18 Apr 2025 14:37:15 GMT (envelope-from git) Date: Fri, 18 Apr 2025 14:37:15 GMT Message-Id: <202504181437.53IEbFtZ091906@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: e36fd5d2b60f - stable/14 - LinuxKPI: 802.11: try to limit VHT (11ac) to 5Ghz 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: e36fd5d2b60ff816e3f56253460de5c370e1d5c4 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=e36fd5d2b60ff816e3f56253460de5c370e1d5c4 commit e36fd5d2b60ff816e3f56253460de5c370e1d5c4 Author: Bjoern A. Zeeb AuthorDate: 2025-04-09 19:22:25 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-04-18 14:36:01 +0000 LinuxKPI: 802.11: try to limit VHT (11ac) to 5Ghz We have multiple reports for iwlwifi firmware crashes where net80211 logged: ieee80211_sta_join: BSS xx:xx:xx:xx:xx:xx: 2GHz channel, VHT info; ignoring Make sure when we sync from net80211 or set state that we only do VHT if we are on the 5Ghz band. This change is likely helpful whether it fixes the originally reported problems or not. Sponsored by: The FreeBSD Foundation Reported by: Jonathan Vasquez (jon xyinn.org) Reported by: Michael Butler (imb protected-networks.net) Reported by: others (fw crash w/o net80211 logging) Tested by: Eirik Øverby (ltning-freebsd-wireless anduin.net) Tested by: lwhsu Tested by: Michael Butler (imb protected-networks.net) Differential Revision: https://reviews.freebsd.org/D49761 (cherry picked from commit 5393cd34854e1fe23ab214e9f741879fa6bf1193) --- sys/compat/linuxkpi/common/src/linux_80211.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index edd3b91dcecf..1eff90a1d93e 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -442,7 +442,8 @@ lkpi_sta_sync_vht_from_ni(struct ieee80211_sta *sta, struct ieee80211_node *ni) uint16_t rx_mcs_map; uint8_t mcs; - if ((ni->ni_flags & IEEE80211_NODE_VHT) == 0) { + if ((ni->ni_flags & IEEE80211_NODE_VHT) == 0 || + !IEEE80211_IS_CHAN_VHT_5GHZ(ni->ni_chan)) { sta->deflink.vht_cap.vht_supported = false; return; } @@ -1874,7 +1875,7 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int } #endif #ifdef LKPI_80211_VHT - if (IEEE80211_IS_CHAN_VHT(ni->ni_chan)) { + if (IEEE80211_IS_CHAN_VHT_5GHZ(ni->ni_chan)) { #ifdef __notyet__ if (IEEE80211_IS_CHAN_VHT80P80(ni->ni_chan)) chanctx_conf->def.width = NL80211_CHAN_WIDTH_80P80; @@ -3864,7 +3865,8 @@ lkpi_scan_ies_add(uint8_t *p, struct ieee80211_scan_ies *scan_ies, } #endif #if defined(LKPI_80211_VHT) - if ((vap->iv_vht_flags & IEEE80211_FVHT_VHT) != 0) { + if (band == NL80211_BAND_5GHZ && + (vap->iv_vht_flags & IEEE80211_FVHT_VHT) != 0) { struct ieee80211_channel *c; c = ieee80211_ht_adjust_channel(ic, ic->ic_curchan, @@ -5366,7 +5368,7 @@ lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan, NL80211_BAND_5GHZ); #ifdef LKPI_80211_VHT - if (hw->wiphy->bands[NL80211_BAND_5GHZ]->vht_cap.vht_supported){ + if (hw->wiphy->bands[NL80211_BAND_5GHZ]->vht_cap.vht_supported) { ic->ic_flags_ext |= IEEE80211_FEXT_VHT; ic->ic_vht_cap.vht_cap_info =