Compare commits

...

3 Commits

Author SHA1 Message Date
Sophie Brun
4486ebf4dc Prepare for Release 2021-12-14 17:56:23 +01:00
Sophie Brun
b374d14770 Add a patch to fix the compilation with kernel 5.15 2021-12-14 17:55:44 +01:00
Ben Wilson
69059a85ae Remove template comment and switch spaces to tabs 2021-11-20 14:27:50 +00:00
4 changed files with 90 additions and 1 deletions

10
debian/changelog vendored
View File

@@ -1,3 +1,13 @@
realtek-rtl8188eus-dkms (5.3.9~git20210504.6146193-0kali2) kali-dev; urgency=medium
[ Ben Wilson ]
* Remove template comment and switch spaces to tabs
[ Sophie Brun ]
* Add a patch to fix the compilation with kernel 5.15
-- Sophie Brun <sophie@offensive-security.com> Tue, 14 Dec 2021 17:56:08 +0100
realtek-rtl8188eus-dkms (5.3.9~git20210504.6146193-0kali1) kali-dev; urgency=medium
* New upstream version 5.3.9~git20210504.6146193

View File

@@ -0,0 +1,77 @@
From: Sophie Brun <sophie@offensive-security.com>
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 <linux/if_arp.h>
#include <net/ip.h>
+ #include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)
#include <net/ipx.h>
+#endif
#include <linux/atalk.h>
#include <linux/udp.h>
#include <linux/if_pppox.h>
@@ -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 */

View File

@@ -1 +1,2 @@
Change-dkms-version.patch
fix-compilation-kernel-5.15.patch

3
debian/rules vendored
View File

@@ -1,6 +1,7 @@
#!/usr/bin/make -f
#export DH_VERBOSE = 1
# output every command that modifies files on the build system.
#export DH_VERBOSE = 1
include /usr/share/dpkg/pkg-info.mk
export DEB_VERSION_UPSTREAM