From 2243b25597db79c9781b6e80968f6fd792abe1c0 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Wed, 20 Mar 2019 10:38:23 -0500 Subject: [PATCH] rtl8188eu: Fix build on kernel 5.1 Signed-off-by: Larry Finger --- core/rtw_recv.c | 3 --- os_dep/osdep_service.c | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/core/rtw_recv.c b/core/rtw_recv.c index fa83dba..f08aef6 100755 --- a/core/rtw_recv.c +++ b/core/rtw_recv.c @@ -650,7 +650,6 @@ union recv_frame *decryptor(_adapter *padapter, union recv_frame *precv_frame) return return_packet; } /* ###set the security information in the recv_frame */ -union recv_frame *portctrl(_adapter *adapter, union recv_frame *precv_frame); union recv_frame *portctrl(_adapter *adapter, union recv_frame *precv_frame) { u8 *psta_addr = NULL; @@ -2309,7 +2308,6 @@ exiting: } /* perform defrag */ -union recv_frame *recvframe_defrag(_adapter *adapter, _queue *defrag_q); union recv_frame *recvframe_defrag(_adapter *adapter, _queue *defrag_q) { _list *plist, *phead; @@ -2319,7 +2317,6 @@ union recv_frame *recvframe_defrag(_adapter *adapter, _queue *defrag_q) union recv_frame *prframe, *pnextrframe; _queue *pfree_recv_queue; - curfragnum = 0; pfree_recv_queue = &adapter->recvpriv.free_recv_queue; diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c index b0fa7b2..a8ed81c 100644 --- a/os_dep/osdep_service.c +++ b/os_dep/osdep_service.c @@ -1115,7 +1115,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); @@ -1153,7 +1153,7 @@ static int retriveFromFile(const char *path, u8 *buf, u32 sz) RTW_INFO("%s openFile path:%s fp=%p\n", __func__, path , fp); oldfs = get_fs(); - set_fs(get_ds()); + set_fs(KERNEL_DS); ret = readFile(fp, buf, sz); set_fs(oldfs); closeFile(fp); @@ -1188,7 +1188,7 @@ static int storeToFile(const char *path, u8 *buf, u32 sz) RTW_INFO("%s openFile path:%s fp=%p\n", __func__, path , fp); oldfs = get_fs(); - set_fs(get_ds()); + set_fs(KERNEL_DS); ret = writeFile(fp, buf, sz); set_fs(oldfs); closeFile(fp);