From 661846d8730d95964e7b0a66878933863ef944f0 Mon Sep 17 00:00:00 2001 From: Sophie Brun Date: Thu, 12 May 2022 11:01:50 +0200 Subject: [PATCH] Refresh patches --- debian/patches/Change-dkms-version.patch | 4 +- .../patches/fix-compilation-kernel-5.15.patch | 77 ------------------- debian/patches/series | 1 - 3 files changed, 2 insertions(+), 80 deletions(-) delete mode 100644 debian/patches/fix-compilation-kernel-5.15.patch diff --git a/debian/patches/Change-dkms-version.patch b/debian/patches/Change-dkms-version.patch index 092f1d4..8b16c39 100644 --- a/debian/patches/Change-dkms-version.patch +++ b/debian/patches/Change-dkms-version.patch @@ -8,13 +8,13 @@ Forwarded: not-needed 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dkms.conf b/dkms.conf -index 1c14127..bc56f1e 100644 +index 1c14127..1708d4c 100644 --- a/dkms.conf +++ b/dkms.conf @@ -1,5 +1,5 @@ PACKAGE_NAME="realtek-rtl8188eus" -PACKAGE_VERSION="5.3.9~20200316" -+PACKAGE_VERSION="5.3.9~git20210504.6146193" ++PACKAGE_VERSION="5.3.9~git20220319.0958f29" CLEAN="'make' clean" BUILT_MODULE_NAME[0]=8188eu PROCS_NUM=`nproc` diff --git a/debian/patches/fix-compilation-kernel-5.15.patch b/debian/patches/fix-compilation-kernel-5.15.patch deleted file mode 100644 index 79983b8..0000000 --- a/debian/patches/fix-compilation-kernel-5.15.patch +++ /dev/null @@ -1,77 +0,0 @@ -From: Sophie Brun -Date: Tue, 14 Dec 2021 17:54:33 +0100 -Subject: Fix compilation for kernel 5.15 - - -Drop IPX and Apple Talk support for Linux 5.15 Remove IPX support from -driver, set as obsolete in Jan 2018. IPX is not supported by the Linux -kernel since v5.15-rc1, see commit -6c9b40844751ea30c72f7a2f92f4d704bc6b2927 -Origin: https://github.com/aircrack-ng/rtl8188eus/commit/4830d3906230a4d80ba67709a06c9d5b99764839 ---- - core/rtw_br_ext.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/core/rtw_br_ext.c b/core/rtw_br_ext.c -index 6509df3..4507dce 100644 ---- a/core/rtw_br_ext.c -+++ b/core/rtw_br_ext.c -@@ -17,7 +17,10 @@ - #ifdef __KERNEL__ - #include - #include -+ #include -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0) - #include -+#endif - #include - #include - #include -@@ -169,6 +172,7 @@ static __inline__ void __nat25_generate_ipv4_network_addr(unsigned char *network - } - - -+#ifdef _NET_INET_IPX_H_ - static __inline__ void __nat25_generate_ipx_network_addr_with_node(unsigned char *networkAddr, - unsigned int *ipxNetAddr, unsigned char *ipxNodeAddr) - { -@@ -200,6 +204,7 @@ static __inline__ void __nat25_generate_apple_network_addr(unsigned char *networ - memcpy(networkAddr + 1, (unsigned char *)network, 2); - networkAddr[3] = *node; - } -+#endif - - - static __inline__ void __nat25_generate_pppoe_network_addr(unsigned char *networkAddr, -@@ -329,6 +334,7 @@ static __inline__ int __nat25_network_hash(unsigned char *networkAddr) - x = networkAddr[7] ^ networkAddr[8] ^ networkAddr[9] ^ networkAddr[10]; - - return x & (NAT25_HASH_SIZE - 1); -+#ifdef _NET_INET_IPX_H_ - } else if (networkAddr[0] == NAT25_IPX) { - unsigned long x; - -@@ -342,6 +348,7 @@ static __inline__ int __nat25_network_hash(unsigned char *networkAddr) - x = networkAddr[1] ^ networkAddr[2] ^ networkAddr[3]; - - return x & (NAT25_HASH_SIZE - 1); -+#endif - } else if (networkAddr[0] == NAT25_PPPOE) { - unsigned long x; - -@@ -888,6 +895,7 @@ int nat25_db_handle(_adapter *priv, struct sk_buff *skb, int method) - } - } - -+#ifdef _NET_INET_IPX_H_ - /*---------------------------------------------------*/ - /* Handle IPX and Apple Talk frame */ - /*---------------------------------------------------*/ -@@ -1108,6 +1116,7 @@ int nat25_db_handle(_adapter *priv, struct sk_buff *skb, int method) - - return -1; - } -+#endif - - /*---------------------------------------------------*/ - /* Handle PPPoE frame */ diff --git a/debian/patches/series b/debian/patches/series index 17e2bdd..f1066a3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ Change-dkms-version.patch -fix-compilation-kernel-5.15.patch