Browse Source

net-wireless/rtl8723de: удалён

mhiretskiy
parent
commit
20cd05c5fd
  1. 3
      net-wireless/rtl8723de/Manifest
  2. 16
      net-wireless/rtl8723de/files/rtl-20190515-kernel-4.19.patch
  3. 248
      net-wireless/rtl8723de/files/rtl-20200914-kernel-5.10.patch
  4. 19
      net-wireless/rtl8723de/files/rtl-lower_log.patch
  5. 36
      net-wireless/rtl8723de/rtl8723de-20200302.ebuild
  6. 36
      net-wireless/rtl8723de/rtl8723de-20200617.ebuild
  7. 37
      net-wireless/rtl8723de/rtl8723de-20200914.ebuild

3
net-wireless/rtl8723de/Manifest

@ -1,3 +0,0 @@
DIST rtl8723de-20200302.tar.gz 2459354 BLAKE2B 16187cc8e6e621fd35510ccf33c2d4e8d424061901805814d786cc6875e76d1013ad3daff17005b57522c6a96ede681b7e397574bd0f22e6be2aa2c4a0894106 SHA512 32765fd961236f28c0c2d736acebb42a884060ba96dd3c0f5bef9fb882d8ee1c4eba916fad6aa1f2d4ba9f44341bf2ab17a4369d974d73ae3543c15518b2ce7a
DIST rtl8723de-20200617.tar.gz 2466397 BLAKE2B 8ff75b5adf1c4d5a94edea66eb2070063c03c9aa2aa3132e5902068f6b7b05fc80bcd0d4ad47088f5a25edaeef8b2599177ea4d336b5334230c0388361ce78d9 SHA512 b731039ee6d2262af81c84a4909e04befc12510578888d9efb2366e045493a9b0f1c1f0e98027ea4eb29d0637bf7339f981328c7f4e4e15a77f256f07708e280
DIST rtl8723de-20200914.tar.gz 2466529 BLAKE2B d7f9c3f3821a9ced25276def70381e6eb5d41cc7a3b8a1b69ef04a0ab64e40526787c1a331c17ebf80c643a74cc01f99d0ba5b8c5016d67a1378675964e5e2aa SHA512 3d552fe965e8391f96b712c1a58289a5b023e369536d5cf2a5ef1caadb896d4afc9f4cacdfe56bda4b8e6e739696482199e09f7a0b49af4326ee0ef7573514ec

16
net-wireless/rtl8723de/files/rtl-20190515-kernel-4.19.patch

@ -1,16 +0,0 @@
diff --git a/os_dep/linux/rtw_android.c b/os_dep/linux/rtw_android.c
index 4d0b5fa..f3310ac 100644
--- a/os_dep/linux/rtw_android.c
+++ b/os_dep/linux/rtw_android.c
@@ -632,7 +632,11 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
* post 5.0.0 ==> static inline int access_ok(const void *addr, unsigned long size)
* type int was a previously unused variable
*/
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0))
if (!access_ok(priv_cmd.buf, priv_cmd.total_len)) {
+#else
+ if (!access_ok(VERIFY_READ, priv_cmd.buf, priv_cmd.total_len)) {
+#endif
RTW_INFO("%s: failed to access memory\n", __FUNCTION__);
ret = -EFAULT;
goto exit;

248
net-wireless/rtl8723de/files/rtl-20200914-kernel-5.10.patch

@ -1,248 +0,0 @@
diff --git a/core/efuse/rtw_efuse.c b/core/efuse/rtw_efuse.c
index b9a1770..f1b8f9c 100644
--- a/core/efuse/rtw_efuse.c
+++ b/core/efuse/rtw_efuse.c
@@ -2375,7 +2375,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 b835fb5..43e329d 100644
--- a/core/rtw_btcoex.c
+++ b/core/rtw_btcoex.c
@@ -1422,7 +1422,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;
@@ -1452,15 +1454,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 8a76427..2c4970f 100644
--- a/core/rtw_ieee80211.c
+++ b/core/rtw_ieee80211.c
@@ -1303,7 +1303,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 be671d0..292e9d2 100644
--- a/core/rtw_wlan_util.c
+++ b/core/rtw_wlan_util.c
@@ -4630,7 +4630,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;
@@ -4667,8 +4669,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);
@@ -4678,7 +4682,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 a590b8d..c0f822a 100644
--- a/os_dep/linux/os_intfs.c
+++ b/os_dep/linux/os_intfs.c
@@ -3193,7 +3193,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;
@@ -3232,14 +3234,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;
@@ -3264,10 +3270,14 @@ 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
err = sock_recvmsg(sock, &msg, PAGE_SIZE, MSG_DONTWAIT);
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
set_fs(oldfs);
+#endif
if (err < 0)
goto out_sock_pg;
@@ -3338,14 +3348,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 e63eaac..676f9c9 100644
--- a/os_dep/osdep_service.c
+++ b/os_dep/osdep_service.c
@@ -2077,15 +2077,19 @@ 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();
set_fs(KERNEL_DS);
+#endif
if (1 != readFile(fp, &buf, 1))
ret = PTR_ERR(fp);
@@ -2098,7 +2102,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;
@@ -2114,7 +2120,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) {
@@ -2122,10 +2130,14 @@ 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();
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);
RTW_INFO("%s readFile, ret:%d\n", __FUNCTION__, ret);
@@ -2149,7 +2161,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) {
@@ -2157,10 +2171,14 @@ 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();
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);
RTW_INFO("%s writeFile, ret:%d\n", __FUNCTION__, ret);

19
net-wireless/rtl8723de/files/rtl-lower_log.patch

@ -1,19 +0,0 @@
commit bb771c15d3becceb401ef74f8bb5ea5c3ce6688c
Author: jeremyb31 <jeremy53561@gmail.com>
Date: Sun Dec 24 14:59:44 2017 -0600
lower default log level
diff --git a/Makefile b/Makefile
index 063e647..731c462 100644
--- a/Makefile
+++ b/Makefile
@@ -76,7 +76,7 @@ CONFIG_RTW_GRO = y
CONFIG_RTW_DEBUG = y
# default log level is _DRV_INFO_ = 4,
# please refer to "How_to_set_driver_debug_log_level.doc" to set the available level.
-CONFIG_RTW_LOG_LEVEL = 4
+CONFIG_RTW_LOG_LEVEL = 1
######################## Wake On Lan ##########################
CONFIG_WOWLAN = n
CONFIG_GPIO_WAKEUP = n

36
net-wireless/rtl8723de/rtl8723de-20200302.ebuild

@ -1,36 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit linux-info linux-mod
COMMIT="b84e8acd571224d5849d783e712ce0e54c625ad2"
DESCRIPTION="Realtek RTL8723DE module for Linux kernel"
HOMEPAGE="https://github.com/smlinux/rtl8723de"
SRC_URI="https://github.com/smlinux/rtl8723de/archive/${COMMIT}.tar.gz -> rtl8723de-${PV}.tar.gz"
LICENSE="GPL-2"
KEYWORDS="~amd64"
DEPEND="virtual/linux-sources"
RDEPEND=""
S="${WORKDIR}/rtl8723de-${COMMIT}"
MODULE_NAMES="8723de(net/wireless)"
BUILD_TARGETS="all"
BUILD_TARGET_ARCH="${ARCH}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix work with calculate.env
epatch "${FILESDIR}/rtl-lower_log.patch"
}
pkg_setup() {
linux-mod_pkg_setup
BUILD_PARAMS="KERN_DIR=${KV_DIR} KSRC=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
}

36
net-wireless/rtl8723de/rtl8723de-20200617.ebuild

@ -1,36 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit linux-info linux-mod
COMMIT="7b7fc22beaa54d3a0676da345e8a1ac943557463"
DESCRIPTION="Realtek RTL8723DE module for Linux kernel"
HOMEPAGE="https://github.com/smlinux/rtl8723de"
SRC_URI="https://github.com/smlinux/rtl8723de/archive/${COMMIT}.tar.gz -> rtl8723de-${PV}.tar.gz"
LICENSE="GPL-2"
KEYWORDS="~amd64"
DEPEND="virtual/linux-sources"
RDEPEND=""
S="${WORKDIR}/rtl8723de-${COMMIT}"
MODULE_NAMES="8723de(net/wireless)"
BUILD_TARGETS="all"
BUILD_TARGET_ARCH="${ARCH}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix work with calculate.env
epatch "${FILESDIR}/rtl-lower_log.patch"
}
pkg_setup() {
linux-mod_pkg_setup
BUILD_PARAMS="KERN_DIR=${KV_DIR} KSRC=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
}

37
net-wireless/rtl8723de/rtl8723de-20200914.ebuild

@ -1,37 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit linux-info linux-mod
COMMIT="0be0a4a5113e0e60e866da77da3b3c7dd03c86ef"
DESCRIPTION="Realtek RTL8723DE module for Linux kernel"
HOMEPAGE="https://github.com/smlinux/rtl8723de"
SRC_URI="https://github.com/smlinux/rtl8723de/archive/${COMMIT}.tar.gz -> rtl8723de-${PV}.tar.gz"
LICENSE="GPL-2"
KEYWORDS="~amd64"
DEPEND="virtual/linux-sources"
RDEPEND=""
S="${WORKDIR}/rtl8723de-${COMMIT}"
MODULE_NAMES="8723de(net/wireless)"
BUILD_TARGETS="all"
BUILD_TARGET_ARCH="${ARCH}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix work with calculate.env
epatch "${FILESDIR}/rtl-lower_log.patch"
epatch "${FILESDIR}/rtl-20200914-kernel-5.10.patch"
}
pkg_setup() {
linux-mod_pkg_setup
BUILD_PARAMS="KERN_DIR=${KV_DIR} KSRC=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
}
Loading…
Cancel
Save