Merge pull request #247 from fsantini/fix_kernel_5.18

Fix compilation for kernel 5.18
This commit is contained in:
Ole Petter Bang 2022-07-28 09:13:29 +02:00 committed by GitHub
commit 8e3caba10f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions

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

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