From 3f3faa8c51aa74d8b1e8fbca4feef739501bb4a1 Mon Sep 17 00:00:00 2001 From: MattthewWertman Date: Thu, 2 Jun 2022 13:47:25 -0700 Subject: [PATCH 1/2] add complete_and_exit() for kernels older than 5.17 --- include/osdep_service_linux.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/osdep_service_linux.h b/include/osdep_service_linux.h index 32a55b9..3c5ec93 100644 --- a/include/osdep_service_linux.h +++ b/include/osdep_service_linux.h @@ -145,8 +145,12 @@ typedef void* _thread_hdl_; typedef int thread_return; typedef void* thread_context; - - #define thread_exit() kthread_complete_and_exit(NULL, 0) + +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0) + #define thread_exit() complete_and_exit(NULL, 0) +#else + #define thread_exit() kthread_complete_and_exit(NULL, 0) +#endif typedef void timer_hdl_return; typedef void* timer_hdl_context; From 515c14a3a5aca905ca53e1024e814bf79aae99d3 Mon Sep 17 00:00:00 2001 From: fsantini Date: Mon, 13 Jun 2022 17:40:15 +0200 Subject: [PATCH 2/2] remove unused mm_segment_t references; change definition of is_*_mac_addr --- include/ieee80211.h | 4 ++-- os_dep/osdep_service.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/ieee80211.h b/include/ieee80211.h index c8dd510..dbe40eb 100644 --- a/include/ieee80211.h +++ b/include/ieee80211.h @@ -1286,12 +1286,12 @@ enum ieee80211_state { (((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \ (((Addr[5]) & 0xff) == 0xff)) #else -extern __inline int is_multicast_mac_addr(const u8 *addr) +static __inline int is_multicast_mac_addr(const u8 *addr) { return ((addr[0] != 0xff) && (0x01 & addr[0])); } -extern __inline int is_broadcast_mac_addr(const u8 *addr) +static __inline int is_broadcast_mac_addr(const u8 *addr) { return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \ (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff)); diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c index 5996d6d..bbc2d6c 100644 --- a/os_dep/osdep_service.c +++ b/os_dep/osdep_service.c @@ -1571,7 +1571,6 @@ static int isFileReadable(char *path) static int retriveFromFile(char *path, u8* buf, u32 sz) { int ret =-1; - mm_segment_t oldfs; struct file *fp; if(path && buf) { @@ -1603,7 +1602,6 @@ static int retriveFromFile(char *path, u8* buf, u32 sz) static int storeToFile(char *path, u8* buf, u32 sz) { int ret =0; - mm_segment_t oldfs; struct file *fp; if(path && buf) {