mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
cd3de51bb4
This adds a few fixes for compiling against Linux 5.10:
1. segment_eq() has been removed with upstream commit
428e2976a5bf7e7f5554286d7a5a33b8147b106a ("uaccess: remove
segment_eq") and can use uaccess_kernel() instead
2. ioremap_nocache() is removed and is now an alias for ioremap() with
upstream commit 4bdc0d676a643140bdf17dbf7eafedee3d496a3c ("remove
ioremap_nocache and devm_ioremap_nocache")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
Index: broadcom-wl-5.10.56.27.3/driver/wl_linux.c
|
|
===================================================================
|
|
--- broadcom-wl-5.10.56.27.3.orig/driver/wl_linux.c
|
|
+++ broadcom-wl-5.10.56.27.3/driver/wl_linux.c
|
|
@@ -74,6 +74,10 @@
|
|
#error "No support for Kernel Rev <= 2.4.5, As the older kernel revs doesn't support Tasklets"
|
|
#endif
|
|
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
|
|
+#define ioremap_nocache ioremap
|
|
+#endif
|
|
+
|
|
typedef void wlc_info_t;
|
|
typedef void wlc_hw_info_t;
|
|
#include <wlc_pub.h>
|
|
@@ -1915,7 +1919,11 @@ wl_ioctl(struct net_device *dev, struct
|
|
}
|
|
|
|
/* optimization for direct ioctl calls from kernel */
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
|
|
if (segment_eq(get_fs(), KERNEL_DS))
|
|
+#else
|
|
+ if (uaccess_kernel())
|
|
+#endif
|
|
buf = ioc.buf;
|
|
|
|
else if (ioc.buf) {
|
|
Index: broadcom-wl-5.10.56.27.3/driver/linux_osl.c
|
|
===================================================================
|
|
--- broadcom-wl-5.10.56.27.3.orig/driver/linux_osl.c
|
|
+++ broadcom-wl-5.10.56.27.3/driver/linux_osl.c
|
|
@@ -34,6 +34,10 @@
|
|
#define OS_HANDLE_MAGIC 0x1234abcd /* Magic # to recognise osh */
|
|
#define BCM_MEM_FILENAME_LEN 24 /* Mem. filename length */
|
|
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
|
|
+#define ioremap_nocache ioremap
|
|
+#endif
|
|
+
|
|
typedef struct bcm_mem_link {
|
|
struct bcm_mem_link *prev;
|
|
struct bcm_mem_link *next;
|