Skip to content

Commit

Permalink
rtl8723du: Fix builds with kernel 5.10
Browse files Browse the repository at this point in the history
Signed-off-by: Larry Finger <[email protected]>
  • Loading branch information
lwfinger committed Nov 24, 2020
1 parent ce4490b commit 9ce1c38
Showing 1 changed file with 18 additions and 0 deletions.
18 changes: 18 additions & 0 deletions os_dep/osdep_service.c
Original file line number Diff line number Diff line change
Expand Up @@ -717,20 +717,26 @@ static int isFileReadable(char *path)
{
struct file *fp;
int ret = 0;
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
mm_segment_t oldfs;
#endif
char buf;

fp=filp_open(path, O_RDONLY, 0);
if(IS_ERR(fp)) {
ret = PTR_ERR(fp);
}
else {
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
oldfs = get_fs(); set_fs(KERNEL_DS);
#endif

if(1!=readFile(fp, &buf, 1))
ret = PTR_ERR(fp);

#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
set_fs(oldfs);
#endif
filp_close(fp,NULL);
}
return ret;
Expand All @@ -746,16 +752,22 @@ static int isFileReadable(char *path)
static int retriveFromFile(char *path, u8* buf, u32 sz)
{
int ret =-1;
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
mm_segment_t oldfs;
#endif
struct file *fp;

if(path && buf) {
if( 0 == (ret=openFile(&fp,path, O_RDONLY, 0)) ){
DBG_871X("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp);

#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
oldfs = get_fs(); set_fs(KERNEL_DS);
#endif
ret=readFile(fp, buf, sz);
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
set_fs(oldfs);
#endif
closeFile(fp);

DBG_871X("%s readFile, ret:%d\n",__FUNCTION__, ret);
Expand All @@ -780,16 +792,22 @@ static int retriveFromFile(char *path, u8* buf, u32 sz)
static int storeToFile(char *path, u8* buf, u32 sz)
{
int ret =0;
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
mm_segment_t oldfs;
#endif
struct file *fp;

if(path && buf) {
if( 0 == (ret=openFile(&fp, path, O_CREAT|O_WRONLY, 0666)) ) {
DBG_871X("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp);

#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
oldfs = get_fs(); set_fs(KERNEL_DS);
#endif
ret=writeFile(fp, buf, sz);
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
set_fs(oldfs);
#endif
closeFile(fp);

DBG_871X("%s writeFile, ret:%d\n",__FUNCTION__, ret);
Expand Down

0 comments on commit 9ce1c38

Please sign in to comment.