diff -Nru rtl8188eus-dkms-5.3.9~impish1/debian/changelog rtl8188eus-dkms-5.3.9~jammy2/debian/changelog --- rtl8188eus-dkms-5.3.9~impish1/debian/changelog 2021-11-09 22:44:07.000000000 +0000 +++ rtl8188eus-dkms-5.3.9~jammy2/debian/changelog 2022-03-14 12:01:21.000000000 +0000 @@ -1,4 +1,11 @@ -rtl8188eus-dkms (5.3.9~impish1) impish; urgency=medium +rtl8188eus-dkms (5.3.9~jammy2) jammy; urgency=medium + + * Added buildfix for Linux 5.17 + * Removed obselete REMAKE_INITRD from dkms.conf + + -- Gökhan Gökkaya Mon, 14 Mar 2022 15:01:21 +0300 + +rtl8188eus-dkms (5.3.9~focal1) focal; urgency=medium * Updated from github source (May 4, 2021). - Added buildfix for Linux 5.15 diff -Nru rtl8188eus-dkms-5.3.9~impish1/debian/control rtl8188eus-dkms-5.3.9~jammy2/debian/control --- rtl8188eus-dkms-5.3.9~impish1/debian/control 2021-11-09 22:40:35.000000000 +0000 +++ rtl8188eus-dkms-5.3.9~jammy2/debian/control 2022-03-14 11:58:43.000000000 +0000 @@ -8,7 +8,7 @@ Package: rtl8188eus-dkms Architecture: all -Depends: ${misc:Depends}, dkms, linux-libc-dev, libc6-dev +Depends: ${misc:Depends}, dkms, bc Conflicts: rtl8188eu-dkms Replaces: rtl8188eu-dkms XB-Modaliases: ${modaliases} diff -Nru rtl8188eus-dkms-5.3.9~impish1/debian/rtl8188eus-dkms.dkms rtl8188eus-dkms-5.3.9~jammy2/debian/rtl8188eus-dkms.dkms --- rtl8188eus-dkms-5.3.9~impish1/debian/rtl8188eus-dkms.dkms 2021-07-13 14:25:30.000000000 +0000 +++ rtl8188eus-dkms-5.3.9~jammy2/debian/rtl8188eus-dkms.dkms 2022-03-14 12:01:21.000000000 +0000 @@ -5,4 +5,3 @@ MAKE[0]="'make' all KVER=${kernelver}" CLEAN="'make' clean" AUTOINSTALL="yes" -REMAKE_INITRD="yes" diff -Nru rtl8188eus-dkms-5.3.9~impish1/rtl8188eus/os_dep/linux/os_intfs.c rtl8188eus-dkms-5.3.9~jammy2/rtl8188eus/os_dep/linux/os_intfs.c --- rtl8188eus-dkms-5.3.9~impish1/rtl8188eus/os_dep/linux/os_intfs.c 2021-11-09 22:42:32.000000000 +0000 +++ rtl8188eus-dkms-5.3.9~jammy2/rtl8188eus/os_dep/linux/os_intfs.c 2022-03-14 10:43:53.000000000 +0000 @@ -1199,7 +1199,11 @@ } _rtw_memcpy(adapter_mac_addr(padapter), sa->sa_data, ETH_ALEN); /* set mac addr to adapter */ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0)) + eth_hw_addr_set(pnetdev, sa->sa_data); +#else _rtw_memcpy(pnetdev->dev_addr, sa->sa_data, ETH_ALEN); /* set mac addr to net_device */ +#endif #if 0 if (rtw_is_hw_init_completed(padapter)) { @@ -1628,7 +1632,11 @@ /* alloc netdev name */ rtw_init_netdev_name(ndev, name); +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0)) + eth_hw_addr_set(ndev, adapter_mac_addr(adapter)); +#else _rtw_memcpy(ndev->dev_addr, adapter_mac_addr(adapter), ETH_ALEN); +#endif #if defined(CONFIG_NET_NS) dev_net_set(ndev, wiphy_net(adapter_to_wiphy(adapter))); #endif //defined(CONFIG_NET_NS) diff -Nru rtl8188eus-dkms-5.3.9~impish1/rtl8188eus/os_dep/linux/rtw_proc.c rtl8188eus-dkms-5.3.9~jammy2/rtl8188eus/os_dep/linux/rtw_proc.c --- rtl8188eus-dkms-5.3.9~impish1/rtl8188eus/os_dep/linux/rtw_proc.c 2021-11-09 22:42:32.000000000 +0000 +++ rtl8188eus-dkms-5.3.9~jammy2/rtl8188eus/os_dep/linux/rtw_proc.c 2022-03-14 10:44:19.000000000 +0000 @@ -37,6 +37,8 @@ #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 +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0)) +#define PDE_DATA(inode) pde_data(inode) #endif #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)) diff -Nru rtl8188eus-dkms-5.3.9~impish1/rtl8188eus/os_dep/osdep_service.c rtl8188eus-dkms-5.3.9~jammy2/rtl8188eus/os_dep/osdep_service.c --- rtl8188eus-dkms-5.3.9~impish1/rtl8188eus/os_dep/osdep_service.c 2021-11-09 22:42:32.000000000 +0000 +++ rtl8188eus-dkms-5.3.9~jammy2/rtl8188eus/os_dep/osdep_service.c 2022-03-14 10:44:47.000000000 +0000 @@ -1268,8 +1268,12 @@ inline void thread_exit(_completion *comp) { #ifdef PLATFORM_LINUX +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0)) + kthread_complete_and_exit(comp, 0); +#else complete_and_exit(comp, 0); #endif +#endif #ifdef PLATFORM_FREEBSD printf("%s", "RTKTHREAD_exit");