diff --git a/lib/compilation-prepare.sh b/lib/compilation-prepare.sh index 9251b5aefe..15a17f9f8c 100644 --- a/lib/compilation-prepare.sh +++ b/lib/compilation-prepare.sh @@ -402,8 +402,7 @@ compilation_prepare() display_alert "Adding" "Wireless drivers for Realtek 8723DS chipsets ${rtl8723dsver}" "info" - #fetch_from_repo "https://github.com/lwfinger/rtl8723ds" "rtl8723ds" "${rtl8723dsver}" "yes" - fetch_from_repo "https://github.com/igorpecovnik/rtl8723ds" "rtl8723ds" "${rtl8723dsver}" "yes" + fetch_from_repo "https://github.com/lwfinger/rtl8723ds" "rtl8723ds" "${rtl8723dsver}" "yes" cd ${SRC}/cache/sources/${LINUXSOURCEDIR} rm -rf ${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8723ds mkdir -p ${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8723ds/ @@ -425,9 +424,6 @@ compilation_prepare() sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/rtl8723ds\/Kconfig"' \ $SRC/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/Kconfig - # kernel 5.6 -> - process_patch_file "${SRC}/patch/misc/wireless-rtl8723ds.patch" "applying" - fi } diff --git a/patch/misc/wireless-rtl8723ds.patch b/patch/misc/wireless-rtl8723ds.patch deleted file mode 100644 index 73743c61f8..0000000000 --- a/patch/misc/wireless-rtl8723ds.patch +++ /dev/null @@ -1,148 +0,0 @@ ---- a/drivers/net/wireless/rtl8723ds/os_dep/linux/rtw_proc.c -+++ b/drivers/net/wireless/rtl8723ds/os_dep/linux/rtw_proc.c -@@ -68,8 +68,14 @@ - return entry; - } - --inline struct proc_dir_entry *rtw_proc_create_entry(const char *name, struct proc_dir_entry *parent, -- const struct file_operations *fops, void * data) -+inline struct proc_dir_entry *rtw_proc_create_entry(const char *name, -+ struct proc_dir_entry *parent, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)) -+ const struct proc_ops *fops, -+#else -+ const struct file_operations *fops, -+#endif -+ void * data) - { - struct proc_dir_entry *entry; - -@@ -219,6 +225,15 @@ - return -EROFS; - } - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)) -+static const struct proc_ops rtw_drv_proc_seq_fops = { -+ .proc_open = rtw_drv_proc_open, -+ .proc_read = seq_read, -+ .proc_lseek = seq_lseek, -+ .proc_release = seq_release, -+ .proc_write = rtw_drv_proc_write, -+}; -+#else - static const struct file_operations rtw_drv_proc_seq_fops = { - .owner = THIS_MODULE, - .open = rtw_drv_proc_open, -@@ -227,7 +242,17 @@ - .release = seq_release, - .write = rtw_drv_proc_write, - }; -- -+#endif -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)) -+static const struct proc_ops rtw_drv_proc_sseq_fops = { -+ .proc_open = rtw_drv_proc_open, -+ .proc_read = seq_read, -+ .proc_lseek = seq_lseek, -+ .proc_release = single_release, -+ .proc_write = rtw_drv_proc_write, -+}; -+#else - static const struct file_operations rtw_drv_proc_sseq_fops = { - .owner = THIS_MODULE, - .open = rtw_drv_proc_open, -@@ -236,6 +261,7 @@ - .release = single_release, - .write = rtw_drv_proc_write, - }; -+#endif - - int rtw_drv_proc_init(void) - { -@@ -2325,6 +2351,15 @@ - return -EROFS; - } - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)) -+static const struct proc_ops rtw_adapter_proc_seq_fops = { -+ .proc_open = rtw_adapter_proc_open, -+ .proc_read = seq_read, -+ .proc_lseek = seq_lseek, -+ .proc_release = seq_release, -+ .proc_write = rtw_adapter_proc_write, -+}; -+#else - static const struct file_operations rtw_adapter_proc_seq_fops = { - .owner = THIS_MODULE, - .open = rtw_adapter_proc_open, -@@ -2333,7 +2368,17 @@ - .release = seq_release, - .write = rtw_adapter_proc_write, - }; -- -+#endif -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)) -+static const struct proc_ops rtw_adapter_proc_sseq_fops = { -+ .proc_open = rtw_adapter_proc_open, -+ .proc_read = seq_read, -+ .proc_lseek = seq_lseek, -+ .proc_release = single_release, -+ .proc_write = rtw_adapter_proc_write, -+}; -+#else - static const struct file_operations rtw_adapter_proc_sseq_fops = { - .owner = THIS_MODULE, - .open = rtw_adapter_proc_open, -@@ -2342,6 +2387,7 @@ - .release = single_release, - .write = rtw_adapter_proc_write, - }; -+#endif - - int proc_get_odm_dbg_comp(struct seq_file *m, void *v) - { -@@ -2660,6 +2706,15 @@ - return -EROFS; - } - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)) -+static const struct proc_ops rtw_odm_proc_seq_fops = { -+ .proc_open = rtw_odm_proc_open, -+ .proc_read = seq_read, -+ .proc_lseek = seq_lseek, -+ .proc_release = seq_release, -+ .proc_write = rtw_odm_proc_write, -+}; -+#else - static const struct file_operations rtw_odm_proc_seq_fops = { - .owner = THIS_MODULE, - .open = rtw_odm_proc_open, -@@ -2668,7 +2723,16 @@ - .release = seq_release, - .write = rtw_odm_proc_write, - }; -- -+#endif -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)) -+static const struct proc_ops rtw_odm_proc_sseq_fops = { -+ .proc_open = rtw_odm_proc_open, -+ .proc_read = seq_read, -+ .proc_lseek = seq_lseek, -+ .proc_release = single_release, -+ .proc_write = rtw_odm_proc_write, -+}; -+#else - static const struct file_operations rtw_odm_proc_sseq_fops = { - .owner = THIS_MODULE, - .open = rtw_odm_proc_open, -@@ -2677,6 +2741,7 @@ - .release = single_release, - .write = rtw_odm_proc_write, - }; -+#endif - - struct proc_dir_entry *rtw_odm_proc_init(struct net_device *dev) - { -