random-mirrors/amazingfate-rtl8723ds
1
0
Fork 0
mirror of https://github.com/amazingfate/rtl8723ds.git synced 2025-10-17 14:18:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1 from HonJEK/master

Browse Source 
Fix for linux >=5.1 "get_ds" removed

Thanks.
This commit is contained in:
lwfinger 2019-07-15 11:51:32 -05:00 committed by GitHub
commit fd4403497d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
os_dep/osdep_service.c
View File

@ -1290,7 +1290,7 @@ static int isFileReadable(const char *path, u32 *sz)
ret = PTR_ERR(fp); ret = PTR_ERR(fp);
else { else {
oldfs = get_fs(); oldfs = get_fs();
set_fs(get_ds()); set_fs(KERNEL_DS);
if (1 != readFile(fp, &buf, 1)) if (1 != readFile(fp, &buf, 1))
ret = PTR_ERR(fp); ret = PTR_ERR(fp);
@ -1328,7 +1328,7 @@ static int retriveFromFile(const char *path, u8 *buf, u32 sz)
RTW_INFO("%s openFile path:%s fp=%p\n", __FUNCTION__, path , fp); RTW_INFO("%s openFile path:%s fp=%p\n", __FUNCTION__, path , fp);
oldfs = get_fs(); oldfs = get_fs();
set_fs(get_ds()); set_fs(KERNEL_DS);
ret = readFile(fp, buf, sz); ret = readFile(fp, buf, sz);
set_fs(oldfs); set_fs(oldfs);
closeFile(fp); closeFile(fp);
@ -1363,7 +1363,7 @@ static int storeToFile(const char *path, u8 *buf, u32 sz)
RTW_INFO("%s openFile path:%s fp=%p\n", __FUNCTION__, path , fp); RTW_INFO("%s openFile path:%s fp=%p\n", __FUNCTION__, path , fp);
oldfs = get_fs(); oldfs = get_fs();
set_fs(get_ds()); set_fs(KERNEL_DS);
ret = writeFile(fp, buf, sz); ret = writeFile(fp, buf, sz);
set_fs(oldfs); set_fs(oldfs);
closeFile(fp); closeFile(fp);
@ -1786,7 +1786,7 @@ int map_readN(const struct map_t *map, u16 offset, u16 len, u8 *buf)
else else
c_len = seg->sa + seg->len - offset; c_len = seg->sa + seg->len - offset;
} }
_rtw_memcpy(c_dst, c_src, c_len); _rtw_memcpy(c_dst, c_src, c_len);
} }