skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-04-03 17:54:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix kernel 5.15 compilation

Browse source 
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
This commit is contained in:
Carlos Garcés 2021-10-10 12:33:58 +02:00
parent 5fbebcb35b
commit 3b5034b445
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/rtw_br_ext.c
View file

@ -21,7 +21,10 @@
#include <linux/if_arp.h> #include <linux/if_arp.h>
#include <net/ip.h> #include <net/ip.h>
#include <linux/version.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)
#include <net/ipx.h> #include <net/ipx.h>
#endif
#include <linux/atalk.h> #include <linux/atalk.h>
#include <linux/udp.h> #include <linux/udp.h>
#include <linux/if_pppox.h> #include <linux/if_pppox.h>
@ -149,6 +152,7 @@ static inline void __nat25_generate_ipv4_network_addr(unsigned char *networkAddr
memcpy(networkAddr+7, (unsigned char *)ipAddr, 4); memcpy(networkAddr+7, (unsigned char *)ipAddr, 4);
} }
#ifdef _NET_INET_IPX_H_
static inline void __nat25_generate_ipx_network_addr_with_node(unsigned char *networkAddr, static inline void __nat25_generate_ipx_network_addr_with_node(unsigned char *networkAddr,
unsigned int *ipxNetAddr, unsigned char *ipxNodeAddr) unsigned int *ipxNetAddr, unsigned char *ipxNodeAddr)
{ {
@ -168,6 +172,7 @@ static inline void __nat25_generate_ipx_network_addr_with_socket(unsigned char *
memcpy(networkAddr+1, (unsigned char *)ipxNetAddr, 4); memcpy(networkAddr+1, (unsigned char *)ipxNetAddr, 4);
memcpy(networkAddr+5, (unsigned char *)ipxSocketAddr, 2); memcpy(networkAddr+5, (unsigned char *)ipxSocketAddr, 2);
} }
#endif
static inline void __nat25_generate_apple_network_addr(unsigned char *networkAddr, static inline void __nat25_generate_apple_network_addr(unsigned char *networkAddr,
unsigned short *network, unsigned char *node) unsigned short *network, unsigned char *node)
@ -282,6 +287,7 @@ static inline int __nat25_network_hash(unsigned char *networkAddr)
x = networkAddr[7] ^ networkAddr[8] ^ networkAddr[9] ^ networkAddr[10]; x = networkAddr[7] ^ networkAddr[8] ^ networkAddr[9] ^ networkAddr[10];
return x & (NAT25_HASH_SIZE - 1); return x & (NAT25_HASH_SIZE - 1);
#ifdef _NET_INET_IPX_H_
} else if (networkAddr[0] == NAT25_IPX) { } else if (networkAddr[0] == NAT25_IPX) {
unsigned long x; unsigned long x;
@ -289,6 +295,7 @@ static inline int __nat25_network_hash(unsigned char *networkAddr)
networkAddr[6] ^ networkAddr[7] ^ networkAddr[8] ^ networkAddr[9] ^ networkAddr[10]; networkAddr[6] ^ networkAddr[7] ^ networkAddr[8] ^ networkAddr[9] ^ networkAddr[10];
return x & (NAT25_HASH_SIZE - 1); return x & (NAT25_HASH_SIZE - 1);
#endif
} else if (networkAddr[0] == NAT25_APPLE) { } else if (networkAddr[0] == NAT25_APPLE) {
unsigned long x; unsigned long x;
@ -600,6 +607,7 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
default: default:
return -1; return -1;
} }
#ifdef _NET_INET_IPX_H_
} else if ((protocol == ETH_P_IPX) || } else if ((protocol == ETH_P_IPX) ||
(protocol <= ETH_FRAME_LEN)) { (protocol <= ETH_FRAME_LEN)) {
/*---------------------------------------------------*/ /*---------------------------------------------------*/
@ -797,6 +805,7 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
} }
return -1; return -1;
#endif
} else if ((protocol == ETH_P_PPP_DISC) || } else if ((protocol == ETH_P_PPP_DISC) ||
(protocol == ETH_P_PPP_SES)) { (protocol == ETH_P_PPP_SES)) {
/*---------------------------------------------------*/ /*---------------------------------------------------*/