From nobody Mon Feb 10 14:52:41 2025 X-Original-To: dev-commits-src-branches@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 4Ys6xl0Bd4z5mH23; Mon, 10 Feb 2025 14:52:43 +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 4Ys6xj72NYz4LgG; Mon, 10 Feb 2025 14:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199162; 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=ZQ4cxHWKpKDb+i7Bu1Xnh6xox2NeLXGCCr2spS42Od8=; b=aG2Q1W95FQ7akvENUphTHprWZsvdz7zA3CS9ED9LDMwtdFCdr9wHkaf3/wCG/8kCRFPyZU LUxA4UsLzAufWd5PAgPbuOA7YLvwh0rZH007tKJzH1108C7NkWlJ14CDvtGJjyBGBrFyfe E48I/lTPsurTwflYAZRm/GPvVp/bZdxsizopRTgh7l9cmkZXinbJB7BfAI0FMoOlp5pQFB /+5lOwtTmgptfQkmohL5F9YyRfqRYFSJilclaFTz3y1OZo3YYnvAezm0Z+Tu4YOzaayom7 +FoT7JyjARFL/NpeMKVFifgp94Zf+KAr9gyZvpi1lGerzmdWELwHQldPVpd3bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199162; 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=ZQ4cxHWKpKDb+i7Bu1Xnh6xox2NeLXGCCr2spS42Od8=; b=puyCaCVTviEquoCzjkc0PD97slPsq+iaXAFL7rRy6vHVqHvEgXwofHMndAgPu4CFEXA4W2 3cL3hYdzmrTn3/BKH5VFSHIbLyWcpP0B+YLix6Xbpt+FLQEUqVxfiV2tCtnXhu3Y+CrXvx qw0fu/EtYnAFrAV9QHU2RO//KkLAMSKVKG89P20z2wvJnMkV+t5wb1KfCklbvMH9QtUjj6 h1zwdOHw/TEQuv7t6liBSYdvRIMdEWeq6tKXExFAF6VA0LhBZfob4lpfskaFVKrRgT76uf zr90Q3s7826sxWjMJ4hTI/dmi+A6RIbAKHNFRqxvD+FGwn33iaW5JlQwOr1UgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199162; a=rsa-sha256; cv=none; b=mhit5ln2TGhmo3AfftHvhPCiHmB7VDP9+qwtsBX7Z9Ru4eQR68dk76NkmrIx40e/sokuhi BMo0NsuRrq2o5J/VQaWHACE4xOMfXH3OEqrQB/5jbBvjEvl+L4P2xrZ5tqKeXFVSkbopjq ac7bMiMgOfoRE7LchcCLoRPIhWlw0d0LApoAtrP4ZGyeKWceyc1XqCjPSU0LJrdgYug6sH tja0BOs/RWCAU5Obj4GqbAtHcUlwYI6R4C7ISHGE8dxbYj7eEiTsD6mT2v7U5TSDFMgyTs c9bep9YZJKdTC/DOVuOuXc+aRWTPlNbjrJ1BVZY+mAA5e6JzL5BWVmu7KfTCqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Ys6xj66K9zX78; Mon, 10 Feb 2025 14:52:41 +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 51AEqfDi027935; Mon, 10 Feb 2025 14:52:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqfdY027931; Mon, 10 Feb 2025 14:52:41 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:41 GMT Message-Id: <202502101452.51AEqfdY027931@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: 1a083d59b61a - stable/14 - net80211: HT: check for feature support in ht_recv_action_ht_txchwidth() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 1a083d59b61a687c865f16b9bba4820e820bde2a Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=1a083d59b61a687c865f16b9bba4820e820bde2a commit 1a083d59b61a687c865f16b9bba4820e820bde2a Author: Bjoern A. Zeeb AuthorDate: 2024-12-01 20:16:19 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:09 +0000 net80211: HT: check for feature support in ht_recv_action_ht_txchwidth() ht_recv_action_ht_txchwidth() can blindly change the channel width to 40 Mhz whether or not that is supported. If 20/40 is not supported there is nothing to do as the channel width cannot change in that case. While here mark unused arguments with __unused. Sponosred by: The FreeBSD Foundation Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D47857 (cherry picked from commit 30e8252353d95cc77f787ef784942a551d3e0567) --- sys/net80211/ieee80211_ht.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c index 5da404a92120..e7b3afe17fdc 100644 --- a/sys/net80211/ieee80211_ht.c +++ b/sys/net80211/ieee80211_ht.c @@ -2599,11 +2599,15 @@ ht_recv_action_ba_delba(struct ieee80211_node *ni, static int ht_recv_action_ht_txchwidth(struct ieee80211_node *ni, - const struct ieee80211_frame *wh, - const uint8_t *frm, const uint8_t *efrm) + const struct ieee80211_frame *wh __unused, + const uint8_t *frm, const uint8_t *efrm __unused) { int chw; + /* If 20/40 is not supported the chw cannot change. */ + if ((ni->ni_htcap & IEEE80211_HTCAP_CHWIDTH40) == 0) + return (0); + chw = (frm[2] == IEEE80211_A_HT_TXCHWIDTH_2040) ? IEEE80211_STA_RX_BW_40 : IEEE80211_STA_RX_BW_20;