You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
265 lines
7.2 KiB
265 lines
7.2 KiB
diff --git a/core/efuse/rtw_efuse.c b/core/efuse/rtw_efuse.c
|
|
index a357253..667f5f8 100755
|
|
--- a/core/efuse/rtw_efuse.c
|
|
+++ b/core/efuse/rtw_efuse.c
|
|
@@ -3204,7 +3204,9 @@ int storeAdaptorInfoFile(char *path, u8 *efuse_data)
|
|
int retriveAdaptorInfoFile(char *path, u8 *efuse_data)
|
|
{
|
|
int ret = _SUCCESS;
|
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
|
|
mm_segment_t oldfs;
|
|
+#endif
|
|
struct file *fp;
|
|
|
|
if (path && efuse_data) {
|
|
diff --git a/core/rtw_btcoex.c b/core/rtw_btcoex.c
|
|
index 15df50e..085b5f5 100755
|
|
--- a/core/rtw_btcoex.c
|
|
+++ b/core/rtw_btcoex.c
|
|
@@ -1468,7 +1468,9 @@ u8 rtw_btcoex_sendmsgbysocket(_adapter *padapter, u8 *msg, u8 msg_size, bool for
|
|
{
|
|
u8 error;
|
|
struct msghdr udpmsg;
|
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
|
|
mm_segment_t oldfs;
|
|
+#endif
|
|
struct iovec iov;
|
|
struct bt_coex_info *pcoex_info = &padapter->coex_info;
|
|
|
|
@@ -1498,15 +1500,19 @@ u8 rtw_btcoex_sendmsgbysocket(_adapter *padapter, u8 *msg, u8 msg_size, bool for
|
|
udpmsg.msg_control = NULL;
|
|
udpmsg.msg_controllen = 0;
|
|
udpmsg.msg_flags = MSG_DONTWAIT | MSG_NOSIGNAL;
|
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
|
|
oldfs = get_fs();
|
|
set_fs(KERNEL_DS);
|
|
+#endif
|
|
|
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0))
|
|
error = sock_sendmsg(pcoex_info->udpsock, &udpmsg);
|
|
#else
|
|
error = sock_sendmsg(pcoex_info->udpsock, &udpmsg, msg_size);
|
|
#endif
|
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
|
|
set_fs(oldfs);
|
|
+#endif
|
|
if (error < 0) {
|
|
RTW_INFO("Error when sendimg msg, error:%d\n", error);
|
|
return _FAIL;
|
|
diff --git a/core/rtw_ieee80211.c b/core/rtw_ieee80211.c
|
|
index 846df87..1d15677 100755
|
|
--- a/core/rtw_ieee80211.c
|
|
+++ b/core/rtw_ieee80211.c
|
|
@@ -1522,7 +1522,9 @@ int rtw_get_mac_addr_intel(unsigned char *buf)
|
|
int ret = 0;
|
|
int i;
|
|
struct file *fp = NULL;
|
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
|
|
mm_segment_t oldfs;
|
|
+#endif
|
|
unsigned char c_mac[MAC_ADDRESS_LEN];
|
|
char fname[] = "/config/wifi/mac.txt";
|
|
int jj, kk;
|
|
diff --git a/core/rtw_wlan_util.c b/core/rtw_wlan_util.c
|
|
index fbe575e..f18b242 100755
|
|
--- a/core/rtw_wlan_util.c
|
|
+++ b/core/rtw_wlan_util.c
|
|
@@ -4752,7 +4752,9 @@ int rtw_dev_nlo_info_set(struct pno_nlo_info *nlo_info, pno_ssid_t *ssid,
|
|
|
|
int i = 0;
|
|
struct file *fp;
|
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
|
|
mm_segment_t fs;
|
|
+#endif
|
|
loff_t pos = 0;
|
|
u8 *source = NULL;
|
|
long len = 0;
|
|
@@ -4789,8 +4791,10 @@ int rtw_dev_nlo_info_set(struct pno_nlo_info *nlo_info, pno_ssid_t *ssid,
|
|
return 0;
|
|
}
|
|
|
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
|
|
fs = get_fs();
|
|
set_fs(KERNEL_DS);
|
|
+#endif
|
|
|
|
source = rtw_zmalloc(2048);
|
|
|
|
@@ -4800,7 +4804,9 @@ int rtw_dev_nlo_info_set(struct pno_nlo_info *nlo_info, pno_ssid_t *ssid,
|
|
rtw_mfree(source, 2048);
|
|
}
|
|
|
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
|
|
set_fs(fs);
|
|
+#endif
|
|
filp_close(fp, NULL);
|
|
|
|
RTW_INFO("-%s-\n", __func__);
|
|
diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c
|
|
index b6f1ab6..4b0d634 100755
|
|
--- a/os_dep/linux/os_intfs.c
|
|
+++ b/os_dep/linux/os_intfs.c
|
|
@@ -4247,7 +4247,9 @@ static int route_dump(u32 *gw_addr , int *gw_index)
|
|
struct msghdr msg;
|
|
struct iovec iov;
|
|
struct sockaddr_nl nladdr;
|
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
|
|
mm_segment_t oldfs;
|
|
+#endif
|
|
char *pg;
|
|
int size = 0;
|
|
|
|
@@ -4286,14 +4288,18 @@ static int route_dump(u32 *gw_addr , int *gw_index)
|
|
msg.msg_controllen = 0;
|
|
msg.msg_flags = MSG_DONTWAIT;
|
|
|
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
|
|
oldfs = get_fs();
|
|
set_fs(KERNEL_DS);
|
|
+#endif
|
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0))
|
|
err = sock_sendmsg(sock, &msg);
|
|
#else
|
|
err = sock_sendmsg(sock, &msg, sizeof(req));
|
|
#endif
|
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
|
|
set_fs(oldfs);
|
|
+#endif
|
|
|
|
if (err < 0)
|
|
goto out_sock;
|
|
@@ -4318,14 +4324,18 @@ restart:
|
|
iov_iter_init(&msg.msg_iter, READ, &iov, 1, PAGE_SIZE);
|
|
#endif
|
|
|
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
|
|
oldfs = get_fs();
|
|
set_fs(KERNEL_DS);
|
|
+#endif
|
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0))
|
|
err = sock_recvmsg(sock, &msg, MSG_DONTWAIT);
|
|
#else
|
|
err = sock_recvmsg(sock, &msg, PAGE_SIZE, MSG_DONTWAIT);
|
|
#endif
|
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
|
|
set_fs(oldfs);
|
|
+#endif
|
|
|
|
if (err < 0)
|
|
goto out_sock_pg;
|
|
@@ -4396,14 +4406,18 @@ done:
|
|
msg.msg_controllen = 0;
|
|
msg.msg_flags = MSG_DONTWAIT;
|
|
|
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
|
|
oldfs = get_fs();
|
|
set_fs(KERNEL_DS);
|
|
+#endif
|
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0))
|
|
err = sock_sendmsg(sock, &msg);
|
|
#else
|
|
err = sock_sendmsg(sock, &msg, sizeof(req));
|
|
#endif
|
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
|
|
set_fs(oldfs);
|
|
+#endif
|
|
|
|
if (err > 0)
|
|
goto restart;
|
|
diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c
|
|
index 8237b32..ae76f7c 100755
|
|
--- a/os_dep/osdep_service.c
|
|
+++ b/os_dep/osdep_service.c
|
|
@@ -2213,19 +2213,23 @@ static int isFileReadable(const char *path, u32 *sz)
|
|
{
|
|
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();
|
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0))
|
|
set_fs(KERNEL_DS);
|
|
#else
|
|
set_fs(get_ds());
|
|
#endif
|
|
+#endif
|
|
|
|
if (1 != readFile(fp, &buf, 1))
|
|
ret = PTR_ERR(fp);
|
|
@@ -2238,7 +2242,9 @@ static int isFileReadable(const char *path, u32 *sz)
|
|
#endif
|
|
}
|
|
|
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
|
|
set_fs(oldfs);
|
|
+#endif
|
|
filp_close(fp, NULL);
|
|
}
|
|
return ret;
|
|
@@ -2254,7 +2260,9 @@ static int isFileReadable(const char *path, u32 *sz)
|
|
static int retriveFromFile(const 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) {
|
|
@@ -2262,14 +2270,18 @@ static int retriveFromFile(const char *path, u8 *buf, u32 sz)
|
|
if (0 == ret) {
|
|
RTW_INFO("%s openFile path:%s fp=%p\n", __FUNCTION__, path , fp);
|
|
|
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
|
|
oldfs = get_fs();
|
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0))
|
|
set_fs(KERNEL_DS);
|
|
#else
|
|
set_fs(get_ds());
|
|
#endif
|
|
+#endif
|
|
ret = readFile(fp, buf, sz);
|
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
|
|
set_fs(oldfs);
|
|
+#endif
|
|
closeFile(fp);
|
|
|
|
RTW_INFO("%s readFile, ret:%d\n", __FUNCTION__, ret);
|
|
@@ -2293,7 +2305,9 @@ static int retriveFromFile(const char *path, u8 *buf, u32 sz)
|
|
static int storeToFile(const 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) {
|
|
@@ -2301,14 +2315,18 @@ static int storeToFile(const char *path, u8 *buf, u32 sz)
|
|
if (0 == ret) {
|
|
RTW_INFO("%s openFile path:%s fp=%p\n", __FUNCTION__, path , fp);
|
|
|
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
|
|
oldfs = get_fs();
|
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0))
|
|
set_fs(KERNEL_DS);
|
|
#else
|
|
set_fs(get_ds());
|
|
#endif
|
|
+#endif
|
|
ret = writeFile(fp, buf, sz);
|
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
|
|
set_fs(oldfs);
|
|
+#endif
|
|
closeFile(fp);
|
|
|
|
RTW_INFO("%s writeFile, ret:%d\n", __FUNCTION__, ret);
|