Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Feb 2025 15:03:12 GMT
From:      "Bjoern A. Zeeb" <bz@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 99589b0e1790 - stable/14 - LinuxKPI: rather than manually defining a value use the net80211 define
Message-ID:  <202502261503.51QF3CgJ014563@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by bz:

URL: https://cgit.FreeBSD.org/src/commit/?id=99589b0e1790df208c0bbfc2e0620a5cf8d23e7f

commit 99589b0e1790df208c0bbfc2e0620a5cf8d23e7f
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2025-02-22 23:25:35 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
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 */
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202502261503.51QF3CgJ014563>