From 352330be93bfcc4e8071b8fc3192c8a8321d64dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Garc=C3=A9s?= Date: Wed, 6 Apr 2022 12:33:58 +0200 Subject: [PATCH] Simplify 5.17 patch --- core/rtw_mp.c | 4 ---- include/osdep_service.h | 4 ---- os_dep/linux/ioctl_linux.c | 4 ---- os_dep/linux/rtw_proc.c | 36 ++++-------------------------------- os_dep/osdep_service.c | 7 ------- 5 files changed, 4 insertions(+), 51 deletions(-) diff --git a/core/rtw_mp.c b/core/rtw_mp.c index aec1c2e..951b76e 100644 --- a/core/rtw_mp.c +++ b/core/rtw_mp.c @@ -1355,11 +1355,7 @@ exit: pmptx->pallocated_buf = NULL; pmptx->stop = 1; -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0) thread_exit(NULL); -#else - kthread_thread_exit(NULL); -#endif return 0; } diff --git a/include/osdep_service.h b/include/osdep_service.h index b82680e..ae08c06 100644 --- a/include/osdep_service.h +++ b/include/osdep_service.h @@ -315,11 +315,7 @@ static __inline void thread_enter(char *name) allow_signal(SIGTERM); #endif } -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0) void thread_exit(_completion *comp); -#else -void kthread_thread_exit(_completion *comp); -#endif void _rtw_init_completion(_completion *comp); void _rtw_wait_for_comp_timeout(_completion *comp); void _rtw_wait_for_comp(_completion *comp); diff --git a/os_dep/linux/ioctl_linux.c b/os_dep/linux/ioctl_linux.c index 40b456d..4d16aa3 100644 --- a/os_dep/linux/ioctl_linux.c +++ b/os_dep/linux/ioctl_linux.c @@ -11742,11 +11742,7 @@ thread_return lbk_thread(thread_context context) ploopback->bstop = _TRUE; -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0) thread_exit(NULL); -#else - kthread_thread_exit(NULL); -#endif return 0; } diff --git a/os_dep/linux/rtw_proc.c b/os_dep/linux/rtw_proc.c index feaa6c3..a217e31 100644 --- a/os_dep/linux/rtw_proc.c +++ b/os_dep/linux/rtw_proc.c @@ -34,6 +34,10 @@ inline struct proc_dir_entry *get_rtw_drv_proc(void) #define file_inode(file) ((file)->f_dentry->d_inode) #endif +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17,0)) +#define PDE_DATA(inode) pde_data(inode) +#endif + #if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)) #define PDE_DATA(inode) PDE((inode))->data #define proc_get_parent_data(inode) PDE((inode))->parent->data @@ -211,11 +215,7 @@ const int drv_proc_hdls_num = sizeof(drv_proc_hdls) / sizeof(struct rtw_proc_hdl static int rtw_drv_proc_open(struct inode *inode, struct file *file) { /* struct net_device *dev = proc_get_parent_data(inode); */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0) ssize_t index = (ssize_t)PDE_DATA(inode); -#else - ssize_t index = (ssize_t)inode->i_private; -#endif const struct rtw_proc_hdl *hdl = drv_proc_hdls + index; void *private = NULL; @@ -237,11 +237,7 @@ static int rtw_drv_proc_open(struct inode *inode, struct file *file) static ssize_t rtw_drv_proc_write(struct file *file, const char __user *buffer, size_t count, loff_t *pos) { -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0) ssize_t index = (ssize_t)PDE_DATA(file_inode(file)); -#else - ssize_t index = (ssize_t)file_inode(file)->i_private; -#endif const struct rtw_proc_hdl *hdl = drv_proc_hdls + index; ssize_t (*write)(struct file *, const char __user *, size_t, loff_t *, void *) = hdl->write; @@ -4145,11 +4141,7 @@ const int adapter_proc_hdls_num = sizeof(adapter_proc_hdls) / sizeof(struct rtw_ static int rtw_adapter_proc_open(struct inode *inode, struct file *file) { -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0) ssize_t index = (ssize_t)PDE_DATA(inode); -#else - ssize_t index = (ssize_t)inode->i_private; -#endif const struct rtw_proc_hdl *hdl = adapter_proc_hdls + index; void *private = proc_get_parent_data(inode); @@ -4171,11 +4163,7 @@ static int rtw_adapter_proc_open(struct inode *inode, struct file *file) static ssize_t rtw_adapter_proc_write(struct file *file, const char __user *buffer, size_t count, loff_t *pos) { -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0) ssize_t index = (ssize_t)PDE_DATA(file_inode(file)); -#else - ssize_t index = (ssize_t)file_inode(file)->i_private; -#endif const struct rtw_proc_hdl *hdl = adapter_proc_hdls + index; ssize_t (*write)(struct file *, const char __user *, size_t, loff_t *, void *) = hdl->write; @@ -4340,11 +4328,7 @@ const int odm_proc_hdls_num = sizeof(odm_proc_hdls) / sizeof(struct rtw_proc_hdl static int rtw_odm_proc_open(struct inode *inode, struct file *file) { -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0) ssize_t index = (ssize_t)PDE_DATA(inode); -#else - ssize_t index = (ssize_t)inode->i_private; -#endif const struct rtw_proc_hdl *hdl = odm_proc_hdls + index; void *private = proc_get_parent_data(inode); @@ -4366,11 +4350,7 @@ static int rtw_odm_proc_open(struct inode *inode, struct file *file) static ssize_t rtw_odm_proc_write(struct file *file, const char __user *buffer, size_t count, loff_t *pos) { -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0) ssize_t index = (ssize_t)PDE_DATA(file_inode(file)); -#else - ssize_t index = (ssize_t)file_inode(file)->i_private; -#endif const struct rtw_proc_hdl *hdl = odm_proc_hdls + index; ssize_t (*write)(struct file *, const char __user *, size_t, loff_t *, void *) = hdl->write; @@ -4507,11 +4487,7 @@ const int mcc_proc_hdls_num = sizeof(mcc_proc_hdls) / sizeof(struct rtw_proc_hdl static int rtw_mcc_proc_open(struct inode *inode, struct file *file) { -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0) ssize_t index = (ssize_t)PDE_DATA(inode); -#else - ssize_t index = (ssize_t)inode->i_private; -#endif const struct rtw_proc_hdl *hdl = mcc_proc_hdls + index; void *private = proc_get_parent_data(inode); @@ -4533,11 +4509,7 @@ static int rtw_mcc_proc_open(struct inode *inode, struct file *file) static ssize_t rtw_mcc_proc_write(struct file *file, const char __user *buffer, size_t count, loff_t *pos) { -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0) ssize_t index = (ssize_t)PDE_DATA(file_inode(file)); -#else - ssize_t index = (ssize_t)file_inode(file)->i_private; -#endif const struct rtw_proc_hdl *hdl = mcc_proc_hdls + index; ssize_t (*write)(struct file *, const char __user *, size_t, loff_t *, void *) = hdl->write; diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c index 461ce7c..c3a8411 100644 --- a/os_dep/osdep_service.c +++ b/os_dep/osdep_service.c @@ -872,20 +872,13 @@ u32 _rtw_down_sema(_sema *sema) } -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0) inline void thread_exit(_completion *comp) -#else -inline void kthread_thread_exit(_completion *comp) -#endif { -#ifdef PLATFORM_LINUX #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0) complete_and_exit(comp, 0); #else kthread_complete_and_exit(comp, 0); #endif -#endif - } inline void _rtw_init_completion(_completion *comp)