--- a/backport-include/asm/unaligned.h +++ b/backport-include/asm/unaligned.h @@ -1,6 +1,11 @@ #ifndef __BACKPORT_ASM_GENERIC_UNALIGNED_H #define __BACKPORT_ASM_GENERIC_UNALIGNED_H + +#if LINUX_VERSION_IS_LESS(6,11,0) #include_next +#else +#include_next +#endif #if LINUX_VERSION_IS_LESS(5,7,0) static inline u32 __get_unaligned_be24(const u8 *p) --- a/backport-include/linux/pci.h +++ b/backport-include/linux/pci.h @@ -49,6 +49,7 @@ static inline struct pci_dev *pcie_find_ #endif/* <4.9.0 but not >= 4.4.37, 4.8.13 */ +#if LINUX_VERSION_IS_LESS(6,10,0) #ifndef PCI_IRQ_LEGACY #define PCI_IRQ_LEGACY (1 << 0) /* Allow legacy interrupts */ #define PCI_IRQ_MSI (1 << 1) /* Allow MSI interrupts */ @@ -56,6 +57,7 @@ static inline struct pci_dev *pcie_find_ #define PCI_IRQ_ALL_TYPES \ (PCI_IRQ_LEGACY | PCI_IRQ_MSI | PCI_IRQ_MSIX) #endif +#endif #if defined(CONFIG_PCI) #if LINUX_VERSION_IS_LESS(5,3,0) --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -165,11 +165,19 @@ int cfg80211_switch_netns(struct cfg8021 list_for_each_entry(wdev, &rdev->wiphy.wdev_list, list) { if (!wdev->netdev) continue; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) + wdev->netdev->netns_local = false; +#else wdev->netdev->features &= ~NETIF_F_NETNS_LOCAL; +#endif err = dev_change_net_namespace(wdev->netdev, net, "wlan%d"); if (err) break; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) + wdev->netdev->netns_local = true; +#else wdev->netdev->features |= NETIF_F_NETNS_LOCAL; +#endif } if (err) { @@ -181,11 +189,19 @@ int cfg80211_switch_netns(struct cfg8021 list) { if (!wdev->netdev) continue; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) + wdev->netdev->netns_local = false; +#else wdev->netdev->features &= ~NETIF_F_NETNS_LOCAL; +#endif err = dev_change_net_namespace(wdev->netdev, net, "wlan%d"); WARN_ON(err); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) + wdev->netdev->netns_local = true; +#else wdev->netdev->features |= NETIF_F_NETNS_LOCAL; +#endif } return err; @@ -1480,7 +1496,11 @@ static int cfg80211_netdev_notifier_call SET_NETDEV_DEVTYPE(dev, &wiphy_type); wdev->netdev = dev; /* can only change netns with wiphy */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) + dev->netns_local = true; +#else dev->features |= NETIF_F_NETNS_LOCAL; +#endif cfg80211_init_wdev(wdev); break; --- a/net/mac80211/rc80211_minstrel_ht_debugfs.c +++ b/net/mac80211/rc80211_minstrel_ht_debugfs.c @@ -187,7 +187,9 @@ static const struct file_operations mins .open = minstrel_ht_stats_open, .read = minstrel_stats_read, .release = minstrel_stats_release, +#if LINUX_VERSION_IS_LESS(6,11,0) .llseek = no_llseek, +#endif }; static char * @@ -323,7 +325,9 @@ static const struct file_operations mins .open = minstrel_ht_stats_csv_open, .read = minstrel_stats_read, .release = minstrel_stats_release, +#if LINUX_VERSION_IS_LESS(6,11,0) .llseek = no_llseek, +#endif }; void