mirror
/
openwrt
mirror of https://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Releases Activity

mac80211: fix build regressions on linux 6.1 

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2023-09-11 18:54:04 +02:00
parent 3b86c1f929
commit e648e3ccf9
2 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
package/kernel/mac80211/patches/build/120-headers_version_fix.patch Normal file
View File

@ -0,0 +1,25 @@
--- a/backport-include/linux/random.h
+++ b/backport-include/linux/random.h
@@ -23,7 +23,7 @@ static inline u16 get_random_u16(void)
}
#endif
-#if LINUX_VERSION_IS_LESS(6,2,0)
+#if LINUX_VERSION_IS_LESS(6,1,4)
static inline u32 __get_random_u32_below(u32 ceil)
{
/*
--- a/backport-include/net/dropreason.h
+++ b/backport-include/net/dropreason.h
@@ -3,10 +3,9 @@
#include <linux/version.h>
+#include <net/dropreason-core.h>
#if LINUX_VERSION_IS_GEQ(6,0,0)
#include_next <net/dropreason.h>
-#else
-#include <net/dropreason-core.h>
#endif
#if LINUX_VERSION_IS_LESS(6,4,0)

26
package/kernel/mac80211/patches/build/130-iommu_backport.patch Normal file
View File

@ -0,0 +1,26 @@
--- /dev/null
+++ b/backport-include/linux/iommu.h
@@ -0,0 +1,23 @@
+#ifndef __BACKPORT_LINUX_IOMMU_H
+#define __BACKPORT_LINUX_IOMMU_H
+
+#include_next <linux/iommu.h>
+#include <linux/version.h>
+
+#if LINUX_VERSION_IS_LESS(6,3,0)
+
+static inline int LINUX_BACKPORT(iommu_map)(struct iommu_domain *domain,
+ unsigned long iova,
+ phys_addr_t paddr, size_t size,
+ int prot, gfp_t gfp)
+{
+ if (gfp == GFP_ATOMIC)
+ return iommu_map_atomic(domain, iova, paddr, size, prot);
+
+ return iommu_map(domain, iova, paddr, size, prot);
+}
+#define iommu_map LINUX_BACKPORT(iommu_map)
+
+#endif /* < 6.3 */
+
+#endif