mirrors/gnab-rtl8812au
1
0
Fork 0
mirror of https://github.com/gnab/rtl8812au synced 2025-01-08 17:46:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andriy Tkachuk 2022-07-28 14:48:45 +01:00 committed by GitHub
commit 7af0c2f4fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/ieee80211.h
View File

@ -1286,12 +1286,12 @@ enum ieee80211_state {
(((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \ (((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \
(((Addr[5]) & 0xff) == 0xff)) (((Addr[5]) & 0xff) == 0xff))
#else #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])); 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) && \ return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \
(addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff)); (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));

6
include/osdep_service_linux.h
View File

@ -146,10 +146,10 @@
typedef int thread_return; typedef int thread_return;
typedef void* thread_context; typedef void* thread_context;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0)) #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
#define thread_exit() kthread_complete_and_exit(NULL, 0)
#else
#define thread_exit() complete_and_exit(NULL, 0) #define thread_exit() complete_and_exit(NULL, 0)
#else
#define thread_exit() kthread_complete_and_exit(NULL, 0)
#endif #endif
typedef void timer_hdl_return; typedef void timer_hdl_return;

2
os_dep/osdep_service.c
View File

@ -1571,7 +1571,6 @@ static int isFileReadable(char *path)
static int retriveFromFile(char *path, u8* buf, u32 sz) static int retriveFromFile(char *path, u8* buf, u32 sz)
{ {
int ret =-1; int ret =-1;
mm_segment_t oldfs;
struct file *fp; struct file *fp;
if(path && buf) { 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) static int storeToFile(char *path, u8* buf, u32 sz)
{ {
int ret =0; int ret =0;
mm_segment_t oldfs;
struct file *fp; struct file *fp;
if(path && buf) { if(path && buf) {