summarylogtreecommitdiffstats
path: root/linux-5.15.patch
diff options
context:
space:
mode:
Diffstat (limited to 'linux-5.15.patch')
-rw-r--r--linux-5.15.patch61
1 files changed, 61 insertions, 0 deletions
diff --git a/linux-5.15.patch b/linux-5.15.patch
new file mode 100644
index 000000000000..44bf0621b1f5
--- /dev/null
+++ b/linux-5.15.patch
@@ -0,0 +1,61 @@
+diff --git a/core/rtw_br_ext.c b/core/rtw_br_ext.c
+index 88a517a..9c4ad22 100644
+--- a/core/rtw_br_ext.c
++++ b/core/rtw_br_ext.c
+@@ -22,7 +22,12 @@
+ #ifdef __KERNEL__
+ #include <linux/if_arp.h>
+ #include <net/ip.h>
+-#include <net/ipx.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>
+@@ -170,6 +175,7 @@ static __inline__ void __nat25_generate_ipv4_network_addr(unsigned char *network
+ }
+
+
++#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)
+ {
+@@ -179,8 +185,10 @@ static __inline__ void __nat25_generate_ipx_network_addr_with_node(unsigned char
+ memcpy(networkAddr+1, (unsigned char *)ipxNetAddr, 4);
+ memcpy(networkAddr+5, ipxNodeAddr, 6);
+ }
++#endif
+
+
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0))
+ static __inline__ void __nat25_generate_ipx_network_addr_with_socket(unsigned char *networkAddr,
+ unsigned int *ipxNetAddr, unsigned short *ipxSocketAddr)
+ {
+@@ -190,6 +198,7 @@ static __inline__ void __nat25_generate_ipx_network_addr_with_socket(unsigned ch
+ 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,
+@@ -930,6 +939,7 @@ int nat25_db_handle(_adapter *priv, struct sk_buff *skb, int method)
+ /*---------------------------------------------------*/
+ /* Handle IPX and Apple Talk frame */
+ /*---------------------------------------------------*/
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0))
+ else if((protocol == __constant_htons(ETH_P_IPX)) ||
+ (protocol <= __constant_htons(ETH_FRAME_LEN)))
+ {
+@@ -1190,6 +1200,7 @@ int nat25_db_handle(_adapter *priv, struct sk_buff *skb, int method)
+
+ return -1;
+ }
++#endif
+
+ /*---------------------------------------------------*/
+ /* Handle PPPoE frame */