The branch main has been updated by bz:

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

commit d4898c6e01d80850e4a93a1aa805c44b5f8ca63f
Author:     Bjoern A. Zeeb <[email protected]>
AuthorDate: 2026-01-21 13:52:04 +0000
Commit:     Bjoern A. Zeeb <[email protected]>
CommitDate: 2026-01-21 18:31:08 +0000

    LinuxKPi: 802.11: add more defines
    
    Add more defines and a mac80211 op function pointer used by
    mt76(4) at Linux v6.19-rc6.
    
    Sponsored by:   The FreeBSD Foundation
    MFC after:      3 days
---
 sys/compat/linuxkpi/common/include/linux/ieee80211.h | 1 +
 sys/compat/linuxkpi/common/include/net/cfg80211.h    | 1 +
 sys/compat/linuxkpi/common/include/net/mac80211.h    | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h 
b/sys/compat/linuxkpi/common/include/linux/ieee80211.h
index a9033581a315..d1eba94a3ad8 100644
--- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h
+++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h
@@ -219,6 +219,7 @@ enum ieee80211_min_mpdu_start_spacing {
 #define        IEEE80211_FCTL_TODS                     (IEEE80211_FC1_DIR_TODS 
<< 8)
 #define        IEEE80211_FCTL_MOREFRAGS                
(IEEE80211_FC1_MORE_FRAG << 8)
 #define        IEEE80211_FCTL_PM                       (IEEE80211_FC1_PWR_MGT 
<< 8)
+#define        IEEE80211_FCTL_MOREDATA                 
(IEEE80211_FC1_MORE_DATA << 8)
 
 #define        IEEE80211_FTYPE_MGMT                    IEEE80211_FC0_TYPE_MGT
 #define        IEEE80211_FTYPE_CTL                     IEEE80211_FC0_TYPE_CTL
diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h 
b/sys/compat/linuxkpi/common/include/net/cfg80211.h
index a8ca560a1ec1..94d34fb9dc0c 100644
--- a/sys/compat/linuxkpi/common/include/net/cfg80211.h
+++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h
@@ -124,6 +124,7 @@ enum ieee80211_channel_flags {
        IEEE80211_CHAN_PSD                      = BIT(12),
        IEEE80211_CHAN_ALLOW_6GHZ_VLP_AP        = BIT(13),
        IEEE80211_CHAN_CAN_MONITOR              = BIT(14),
+       IEEE80211_CHAN_NO_EHT                   = BIT(15),
 };
 #define        IEEE80211_CHAN_NO_HT40  
(IEEE80211_CHAN_NO_HT40MINUS|IEEE80211_CHAN_NO_HT40PLUS)
 
diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h 
b/sys/compat/linuxkpi/common/include/net/mac80211.h
index 8d3d04c9afe5..18891d035094 100644
--- a/sys/compat/linuxkpi/common/include/net/mac80211.h
+++ b/sys/compat/linuxkpi/common/include/net/mac80211.h
@@ -1103,6 +1103,8 @@ struct ieee80211_ops {
 
        void (*rfkill_poll)(struct ieee80211_hw *);
 
+       int (*net_fill_forward_path)(struct ieee80211_hw *, struct 
ieee80211_vif *, struct ieee80211_sta *, struct net_device_path_ctx *, struct 
net_device_path *);
+
 /* #ifdef CONFIG_MAC80211_DEBUGFS */   /* Do not change depending on 
compile-time option. */
        void (*sta_add_debugfs)(struct ieee80211_hw *, struct ieee80211_vif *, 
struct ieee80211_sta *, struct dentry *);
        void (*vif_add_debugfs)(struct ieee80211_hw *, struct ieee80211_vif *);

Reply via email to