commit 9355b0677f1192ff4ce61822068448be8c2e4030
Author: Jan Rękorajski <[email protected]>
Date: Sun Nov 7 00:02:33 2021 +0100
- no IPX in kernel 5.15, rel 2
kernel-5.15.patch | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
rtl8812au.spec | 4 +++-
2 files changed, 74 insertions(+), 1 deletion(-)
---
diff --git a/rtl8812au.spec b/rtl8812au.spec
index 5b839c4..74bfc7d 100644
--- a/rtl8812au.spec
+++ b/rtl8812au.spec
@@ -5,7 +5,7 @@
# nothing to be placed to debuginfo package
%define _enable_debug_packages 0
-%define rel 1
+%define rel 2
%define basever 5.9.3.2
%define snap 20210503
%define pname rtl8812au
@@ -19,6 +19,7 @@ Group: Base/Kernel
Source0:
https://github.com/gordboy/%{pname}-%{basever}/archive/main/%{pname}-%{basever}-%{snap}.tar.gz
# Source0-md5: 2b10fc9d5b7af7aa6170779e7f1fa858
Patch0: designated_init.patch
+Patch1: kernel-5.15.patch
# good luck finding this chip on Realtek website :/
#URL: http://www.realtek.com.tw/
URL: https://github.com/gordboy/rtl8812au-5.9.3.2
@@ -64,6 +65,7 @@ Driver for AC1200 (802.11ac) Wireless Dual-Band USB Adapter\
%prep
%setup -q -n %{pname}-%{basever}-main
%patch0 -p1
+%patch1 -p1
%build
%{expand:%build_kernel_packages}
diff --git a/kernel-5.15.patch b/kernel-5.15.patch
new file mode 100644
index 0000000..cd192a2
--- /dev/null
+++ b/kernel-5.15.patch
@@ -0,0 +1,71 @@
+--- rtl8812au-5.9.3.2-main/core/rtw_br_ext.c~ 2021-04-27 13:31:30.000000000
+0200
++++ rtl8812au-5.9.3.2-main/core/rtw_br_ext.c 2021-11-06 23:56:47.750942784
+0100
+@@ -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>
+@@ -57,7 +59,9 @@
+
+ #define NAT25_IPV4 01
+ #define NAT25_IPV6 02
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0))
+ #define NAT25_IPX 03
++#endif
+ #define NAT25_APPLE 04
+ #define NAT25_PPPOE 05
+
+@@ -169,6 +173,7 @@
+ }
+
+
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0))
+ static __inline__ void __nat25_generate_ipx_network_addr_with_node(unsigned
char *networkAddr,
+ unsigned int *ipxNetAddr, unsigned char *ipxNodeAddr)
+ {
+@@ -189,6 +194,7 @@
+ memcpy(networkAddr + 1, (unsigned char *)ipxNetAddr, 4);
+ memcpy(networkAddr + 5, (unsigned char *)ipxSocketAddr, 2);
+ }
++#endif
+
+
+ static __inline__ void __nat25_generate_apple_network_addr(unsigned char
*networkAddr,
+@@ -330,6 +336,7 @@
+ x = networkAddr[7] ^ networkAddr[8] ^ networkAddr[9] ^
networkAddr[10];
+
+ return x & (NAT25_HASH_SIZE - 1);
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0))
+ } else if (networkAddr[0] == NAT25_IPX) {
+ unsigned long x;
+
+@@ -337,6 +344,7 @@
+ networkAddr[6] ^ networkAddr[7] ^ networkAddr[8] ^
networkAddr[9] ^ networkAddr[10];
+
+ return x & (NAT25_HASH_SIZE - 1);
++#endif
+ } else if (networkAddr[0] == NAT25_APPLE) {
+ unsigned long x;
+
+@@ -889,6 +897,7 @@
+ }
+ }
+
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0))
+ /*---------------------------------------------------*/
+ /* Handle IPX and Apple Talk frame */
+ /*---------------------------------------------------*/
+@@ -1120,6 +1119,7 @@
+
+ return -1;
+ }
++#endif
+
+ /*---------------------------------------------------*/
+ /* Handle PPPoE frame */
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rtl8812au.git/commitdiff/9355b0677f1192ff4ce61822068448be8c2e4030
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
