From nobody Wed Feb 26 15:03:12 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 4Z2yQS6qn6z5qG2l; Wed, 26 Feb 2025 15:03:12 +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 4Z2yQS2fGvz3GNr; Wed, 26 Feb 2025 15:03:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740582192; 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=vXdiVVXLcyuLG/avqxsXuFyuNU3lEGICfNHAk4znG+g=; b=hqtshfYIJ8mGCWG32naGbqAbuWMs6vYeUZ0PWcgfohFw02UO6BZZFoZmcCYj2UNPZgSBMQ FVgaUH7otlldXvIGXSc15/Bgh2U9Yab9fSDtniQ2Y0nMcXSBaZ6B0ercGBn+NPpFIL+bjk t8XbgkHfQaYoUFBPra+T83Tab7F6Qik/1dNQvSi0nRoULo5y5l3Fh5zob7jRGktJO1xqRM RfBW0YNmedDBQCbW7g9MF+hFPchEJKXt6J5SsQMsuW88pIRB5nujf7sWE7oAziJ+KADdzw eZ2NoIUvbwWwRNd9EgHDtISuRU77KOeo/4lNks+5IjUarad9pICupEwhici+mA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740582192; a=rsa-sha256; cv=none; b=XW3Qd0zq+beqjZsBqfzBqc6t+INdHcQdkJiTrRdPLpl6EELQk4qIIjssJ/q6iN8JuIitox Ej4wUE7TFg7H536fHfMw9nF/dMOkw1UjpbGlxe3/vWlNfbEP9nFGnBzeit8gleIlb+CcOw tRnWcf0qQXJ/VkfDdebyhX/7wQFphA0Q1NECVjvIzUB5kyCZmt90yCDjxpPuWzi9MPiTko iIQMgKLDACuX28iTKuz5CK3jjR/NphLrlXlFEnhVdRUp8le0Z6HHj2ROKn9ZEhoASCqoTv Itnq35txFXNnbRyW0coxDOlC7EpM1JBkPsvUuSVY7l3rjieAefVzRi/waADXjg== 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=1740582192; 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=vXdiVVXLcyuLG/avqxsXuFyuNU3lEGICfNHAk4znG+g=; b=jzxfxaUaKNALca4isiZQEARO7V9TY/fZYIxpFLsN/cCcI4o4B4wM9SOi2ge85Q5Z7qqcQu rgmHjkDkLhwQDRwjnus+531pHoSOGb2if7XHf6P1YsuA6kclzSw5P4aKNKSOaUMDUCRXXy KaDNHObA5q8MJYAMPcjRt53THJi7+D0WhuPrpFNAwsR9aqVF6pjPfqZ3YiKZRoGUGEmNOi LHXM2/aI+OI2Ogibk+EWrN8DMfBhg+8itP0+iKBOfL0Ldaw3oArCU6OGwGCu+fmekn0n7G xveo/kP9Tte6N1tWeMq5wxegmddX3HmitT5cmP3CRJbfAD4+NaaLAP/iqT+bDA== 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 4Z2yQS2CScz1Gtv; Wed, 26 Feb 2025 15:03:12 +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 51QF3CC5014566; Wed, 26 Feb 2025 15:03:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51QF3CgJ014563; Wed, 26 Feb 2025 15:03:12 GMT (envelope-from git) Date: Wed, 26 Feb 2025 15:03:12 GMT Message-Id: <202502261503.51QF3CgJ014563@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: 99589b0e1790 - stable/14 - LinuxKPI: rather than manually defining a value use the net80211 define 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: 99589b0e1790df208c0bbfc2e0620a5cf8d23e7f Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=99589b0e1790df208c0bbfc2e0620a5cf8d23e7f commit 99589b0e1790df208c0bbfc2e0620a5cf8d23e7f Author: Bjoern A. Zeeb AuthorDate: 2025-02-22 23:25:35 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-26 02:39:27 +0000 LinuxKPI: rather than manually defining a value use the net80211 define Define cfg80211 IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK to net80211 IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK. We should likely at some point make a sweep and replace all the values with the defines from the comments for the matching net80211 version. Sponsored by: The FreeBSD Foundation (cherry picked from commit a6994e208cca65684d160e1795a3b9e8c0a2e0a9) --- sys/compat/linuxkpi/common/include/net/cfg80211.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index 4ae31b257ae0..3454b58f1db7 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2020-2024 The FreeBSD Foundation + * Copyright (c) 2020-2025 The FreeBSD Foundation * Copyright (c) 2021-2022 Bjoern A. Zeeb * * This software was developed by Björn Zeeb under sponsorship from @@ -200,7 +200,7 @@ struct ieee80211_sta_ht_cap { #define IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_160MHZ << IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK_S) #define IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_160_80P80MHZ << IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK_S) -#define IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK 0x0000000c /* IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK */ +#define IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK #define IEEE80211_VHT_CAP_RXLDPC 0x00000010 /* IEEE80211_VHTCAP_RXLDPC */