Merge pull request #365 from satmandu/v5.6.4

Compilation fixes for Kernel 5.1 & 5.2
This commit is contained in:
Christian Bremvåg 2019-05-30 22:50:58 +02:00 committed by GitHub
commit 003c2aa3da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -1364,7 +1364,7 @@ static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb
#else
, void *accel_priv
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0))
, select_queue_fallback_t fallback
#endif
#endif

View File

@ -2201,7 +2201,7 @@ static int isFileReadable(const char *path, u32 *sz)
ret = PTR_ERR(fp);
else {
oldfs = get_fs();
set_fs(get_ds());
set_fs(KERNEL_DS);
if (1 != readFile(fp, &buf, 1))
ret = PTR_ERR(fp);
@ -2239,7 +2239,7 @@ static int retriveFromFile(const char *path, u8 *buf, u32 sz)
RTW_INFO("%s openFile path:%s fp=%p\n", __FUNCTION__, path , fp);
oldfs = get_fs();
set_fs(get_ds());
set_fs(KERNEL_DS);
ret = readFile(fp, buf, sz);
set_fs(oldfs);
closeFile(fp);
@ -2274,7 +2274,7 @@ static int storeToFile(const char *path, u8 *buf, u32 sz)
RTW_INFO("%s openFile path:%s fp=%p\n", __FUNCTION__, path , fp);
oldfs = get_fs();
set_fs(get_ds());
set_fs(KERNEL_DS);
ret = writeFile(fp, buf, sz);
set_fs(oldfs);
closeFile(fp);