Merge branch 'master' into fix-build-on-5.15

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));

include/osdep_service_linux.h

@@ -145,11 +145,11 @@
 	typedef void*		_thread_hdl_;
 	typedef int		thread_return;
 	typedef void*	thread_context;
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0))
-	#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() complete_and_exit(NULL, 0)
+    #define thread_exit() kthread_complete_and_exit(NULL, 0)
 #endif
 
 	typedef void timer_hdl_return;

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) {