Adjust for 5.17 Based on: https://github.com/aircrack-ng/rtl8812au/commit/7e61ad89ccae51a80706f765e1d5f2e82a1662c7 Signed-off-by: Thomas Backlund <tmb@mageia.org> --- 3rdparty/rtl8812au/core/rtw_mp.c | 2 +- 3rdparty/rtl8812au/include/osdep_service.h | 2 +- 3rdparty/rtl8812au/os_dep/linux/ioctl_linux.c | 2 +- 3rdparty/rtl8812au/os_dep/linux/rtw_proc.c | 16 ++++++++-------- 3rdparty/rtl8812au/os_dep/osdep_service.c | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff -urp linux-5.17/3rdparty/rtl8812au.orig/core/rtw_mp.c linux-5.17/3rdparty/rtl8812au/core/rtw_mp.c --- linux-5.17/3rdparty/rtl8812au.orig/core/rtw_mp.c 2022-04-08 21:10:40.015002189 +0300 +++ linux-5.17/3rdparty/rtl8812au/core/rtw_mp.c 2022-04-08 21:28:16.825859876 +0300 @@ -1414,7 +1414,7 @@ exit: pmptx->pallocated_buf = NULL; pmptx->stop = 1; - thread_exit(NULL); + kthread_thread_exit(NULL); return 0; } diff -urp linux-5.17/3rdparty/rtl8812au.orig/include/osdep_service.h linux-5.17/3rdparty/rtl8812au/include/osdep_service.h --- linux-5.17/3rdparty/rtl8812au.orig/include/osdep_service.h 2022-04-08 21:10:40.078005275 +0300 +++ linux-5.17/3rdparty/rtl8812au/include/osdep_service.h 2022-04-08 21:27:14.916804269 +0300 @@ -418,7 +418,7 @@ static __inline void thread_enter(char * printf("%s", "RTKTHREAD_enter"); #endif } -void thread_exit(_completion *comp); +void kthread_thread_exit(_completion *comp); void _rtw_init_completion(_completion *comp); void _rtw_wait_for_comp_timeout(_completion *comp); void _rtw_wait_for_comp(_completion *comp); diff -urp linux-5.17/3rdparty/rtl8812au.orig/os_dep/linux/ioctl_linux.c linux-5.17/3rdparty/rtl8812au/os_dep/linux/ioctl_linux.c --- linux-5.17/3rdparty/rtl8812au.orig/os_dep/linux/ioctl_linux.c 2022-04-08 21:10:40.090005863 +0300 +++ linux-5.17/3rdparty/rtl8812au/os_dep/linux/ioctl_linux.c 2022-04-08 21:25:46.785452162 +0300 @@ -11804,7 +11804,7 @@ thread_return lbk_thread(thread_context ploopback->bstop = _TRUE; - thread_exit(NULL); + kthread_thread_exit(NULL); return 0; } diff -urp linux-5.17/3rdparty/rtl8812au.orig/os_dep/linux/rtw_proc.c linux-5.17/3rdparty/rtl8812au/os_dep/linux/rtw_proc.c --- linux-5.17/3rdparty/rtl8812au.orig/os_dep/linux/rtw_proc.c 2022-04-08 21:10:40.093006010 +0300 +++ linux-5.17/3rdparty/rtl8812au/os_dep/linux/rtw_proc.c 2022-04-08 21:35:51.327259304 +0300 @@ -213,7 +213,7 @@ const int drv_proc_hdls_num = sizeof(drv static int rtw_drv_proc_open(struct inode *inode, struct file *file) { /* struct net_device *dev = proc_get_parent_data(inode); */ - ssize_t index = (ssize_t)PDE_DATA(inode); + ssize_t index = (ssize_t)inode->i_private; const struct rtw_proc_hdl *hdl = drv_proc_hdls + index; void *private = NULL; @@ -235,7 +235,7 @@ static int rtw_drv_proc_open(struct inod static ssize_t rtw_drv_proc_write(struct file *file, const char __user *buffer, size_t count, loff_t *pos) { - ssize_t index = (ssize_t)PDE_DATA(file_inode(file)); + ssize_t index = (ssize_t)file_inode(file)->i_private; 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; @@ -4155,7 +4155,7 @@ const int adapter_proc_hdls_num = sizeof static int rtw_adapter_proc_open(struct inode *inode, struct file *file) { - ssize_t index = (ssize_t)PDE_DATA(inode); + ssize_t index = (ssize_t)inode->i_private; const struct rtw_proc_hdl *hdl = adapter_proc_hdls + index; void *private = proc_get_parent_data(inode); @@ -4177,7 +4177,7 @@ static int rtw_adapter_proc_open(struct static ssize_t rtw_adapter_proc_write(struct file *file, const char __user *buffer, size_t count, loff_t *pos) { - ssize_t index = (ssize_t)PDE_DATA(file_inode(file)); + ssize_t index = (ssize_t)file_inode(file)->i_private; 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; @@ -4342,7 +4342,7 @@ const int odm_proc_hdls_num = sizeof(odm static int rtw_odm_proc_open(struct inode *inode, struct file *file) { - ssize_t index = (ssize_t)PDE_DATA(inode); + ssize_t index = (ssize_t)inode->i_private; const struct rtw_proc_hdl *hdl = odm_proc_hdls + index; void *private = proc_get_parent_data(inode); @@ -4364,7 +4364,7 @@ static int rtw_odm_proc_open(struct inod static ssize_t rtw_odm_proc_write(struct file *file, const char __user *buffer, size_t count, loff_t *pos) { - ssize_t index = (ssize_t)PDE_DATA(file_inode(file)); + ssize_t index = (ssize_t)file_inode(file)->i_private; 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; @@ -4501,7 +4501,7 @@ const int mcc_proc_hdls_num = sizeof(mcc static int rtw_mcc_proc_open(struct inode *inode, struct file *file) { - ssize_t index = (ssize_t)PDE_DATA(inode); + ssize_t index = (ssize_t)inode->i_private; const struct rtw_proc_hdl *hdl = mcc_proc_hdls + index; void *private = proc_get_parent_data(inode); @@ -4523,7 +4523,7 @@ static int rtw_mcc_proc_open(struct inod static ssize_t rtw_mcc_proc_write(struct file *file, const char __user *buffer, size_t count, loff_t *pos) { - ssize_t index = (ssize_t)PDE_DATA(file_inode(file)); + ssize_t index = (ssize_t)file_inode(file)->i_private; 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 -urp linux-5.17/3rdparty/rtl8812au.orig/os_dep/osdep_service.c linux-5.17/3rdparty/rtl8812au/os_dep/osdep_service.c --- linux-5.17/3rdparty/rtl8812au.orig/os_dep/osdep_service.c 2022-04-08 21:10:40.094006059 +0300 +++ linux-5.17/3rdparty/rtl8812au/os_dep/osdep_service.c 2022-04-08 21:36:58.703582498 +0300 @@ -1289,10 +1289,10 @@ u32 _rtw_down_sema(_sema *sema) #endif } -inline void thread_exit(_completion *comp) +inline void kthread_thread_exit(_completion *comp) { #ifdef PLATFORM_LINUX - complete_and_exit(comp, 0); + kthread_complete_and_exit(comp, 0); #endif #ifdef PLATFORM_FREEBSD