From nobody Sun Feb 23 00:38:54 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 4Z0lNb3Rkdz5p25H; Sun, 23 Feb 2025 00:38:55 +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 4Z0lNb0wj4z424n; Sun, 23 Feb 2025 00:38:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740271135; 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=URamFGR0yKkKbaBn3tqT1+v0b2ZguyxV0WvH1gZK1rw=; b=J2WJLo5RgVQOzpg6UYuLM5/5vEod0ioIz61SZHHGxHeTzittEETLT3JplWndHhVqb+Ncpt 7Yq1wx2UYYda7h/y03ljZJ2ushj56hUKhLYNPgtYm7EEOxpOZ+yg3q+ciA4cXIE5PJ+5RW ZZHuhGqKbfDM4h8hPzxYrnYAV4a3ErYGvVyiBFHg2F5f2m9aZ5Bf6cwxBOnCbnCbZn9/M+ QwhtSiPsc1yT8YxE3oGjcZBLmLNSbHzdUjOOKf0tvgc7c01YZ6GKHY5vxNHxIR3B8MtSpa byKd8x4NSpb8uaKa05sw3cZrlzyg0w/pfA80wudwZTOCmtqArPOvlrBJXuZDuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740271135; a=rsa-sha256; cv=none; b=iOG0F2S4f5ATdjPLti8bxll7V9v/CCo5jtoKpDlcpDQdPLRHLvrM9/RlxAcXcQU24Zicjv cadDMb8Mg0OlnV2yVmuXDsqrdpXo+TglfWIFifx5foqmEc7RBc+E2UjXr1l18WkJpI2WoL r6/hZYwHHD/Ellwf9lc8QKjyd5NosCfCkh5/LzsokcCDbiIG5DWbweiPLbYmZf6cXT8Lrj 9yJz+Ff1RtefwKB0AaWIENq60yW5NbVPdErWMdGPh9Zr6lNi37kUgYGA0NSNcvfKl3Qppj xELwdkrEI1f8fLLbYckSUzrpR64WALS99UjwZ+uy3/40cE+A34H3tNqLO0REBA== 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=1740271135; 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=URamFGR0yKkKbaBn3tqT1+v0b2ZguyxV0WvH1gZK1rw=; b=ZxIwox4OlQIDNVmj1GJ74Q3ChFPIbArx5c1jmB1NmnfuuIjekOJPTs2WxZDNLYhNdI/oV7 QVkOMtKV5IA3Ce9J9h5YVPBG7MtWhLZzv+RW54ByKZ2ytKFreYqc0iG47B3t6Uh6AxUw/4 HKF7HobrOAsO9yw0bOD84diYUHT9Flv5SmXRNx7a03EVRVNh82UlXCv/HfTsS+EwKEtqwO +7TqxNYGpE3u7A3IscSDWzIu9OzjmD3brUC+r01HKGcZgPWskkqA3wAHHy+lAD1DswJHOe 0HnbHop4ogt5BMpOkEuC+A7c+QdVuy42b5acCDdlmRUGy0rTpMcjKf3J6cQvgQ== 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 4Z0lNb0QtJzXTV; Sun, 23 Feb 2025 00:38:55 +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 51N0csph014535; Sun, 23 Feb 2025 00:38:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51N0csPs014532; Sun, 23 Feb 2025 00:38:54 GMT (envelope-from git) Date: Sun, 23 Feb 2025 00:38:54 GMT Message-Id: <202502230038.51N0csPs014532@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: a6994e208cca - main - LinuxKPI: rather than manually defining a value use the net80211 define 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/main X-Git-Reftype: branch X-Git-Commit: a6994e208cca65684d160e1795a3b9e8c0a2e0a9 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a6994e208cca65684d160e1795a3b9e8c0a2e0a9 commit a6994e208cca65684d160e1795a3b9e8c0a2e0a9 Author: Bjoern A. Zeeb AuthorDate: 2025-02-22 23:25:35 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-22 23:25:35 +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 MFC after: 3 days --- 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 */