Remove ipx support to build on 5.15
This commit is contained in:
parent
bdd61e6735
commit
2b9ebf386e
|
|
@ -22,7 +22,6 @@
|
||||||
#ifdef __KERNEL__
|
#ifdef __KERNEL__
|
||||||
#include <linux/if_arp.h>
|
#include <linux/if_arp.h>
|
||||||
#include <net/ip.h>
|
#include <net/ip.h>
|
||||||
#include <net/ipx.h>
|
|
||||||
#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>
|
||||||
|
|
@ -174,27 +173,6 @@ static __inline__ void __nat25_generate_ipv4_network_addr(unsigned char *network
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static __inline__ void __nat25_generate_ipx_network_addr_with_node(unsigned char *networkAddr,
|
|
||||||
unsigned int *ipxNetAddr, unsigned char *ipxNodeAddr)
|
|
||||||
{
|
|
||||||
memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
|
|
||||||
|
|
||||||
networkAddr[0] = NAT25_IPX;
|
|
||||||
memcpy(networkAddr+1, (unsigned char *)ipxNetAddr, 4);
|
|
||||||
memcpy(networkAddr+5, ipxNodeAddr, 6);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static __inline__ void __nat25_generate_ipx_network_addr_with_socket(unsigned char *networkAddr,
|
|
||||||
unsigned int *ipxNetAddr, unsigned short *ipxSocketAddr)
|
|
||||||
{
|
|
||||||
memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
|
|
||||||
|
|
||||||
networkAddr[0] = NAT25_IPX;
|
|
||||||
memcpy(networkAddr+1, (unsigned char *)ipxNetAddr, 4);
|
|
||||||
memcpy(networkAddr+5, (unsigned char *)ipxSocketAddr, 2);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
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)
|
||||||
|
|
@ -938,160 +916,12 @@ int nat25_db_handle(_adapter *priv, struct sk_buff *skb, int method)
|
||||||
(protocol == __constant_htons(ETH_P_ATALK)) ||
|
(protocol == __constant_htons(ETH_P_ATALK)) ||
|
||||||
(protocol == __constant_htons(ETH_P_AARP)))
|
(protocol == __constant_htons(ETH_P_AARP)))
|
||||||
{
|
{
|
||||||
unsigned char ipx_header[2] = {0xFF, 0xFF};
|
|
||||||
struct ipxhdr *ipx = NULL;
|
|
||||||
struct elapaarp *ea = NULL;
|
struct elapaarp *ea = NULL;
|
||||||
struct ddpehdr *ddp = NULL;
|
struct ddpehdr *ddp = NULL;
|
||||||
unsigned char *framePtr = skb->data + ETH_HLEN;
|
unsigned char *framePtr = skb->data + ETH_HLEN;
|
||||||
|
|
||||||
if(protocol == __constant_htons(ETH_P_IPX))
|
|
||||||
{
|
|
||||||
DBG_871X("NAT25: Protocol=IPX (Ethernet II)\n");
|
|
||||||
ipx = (struct ipxhdr *)framePtr;
|
|
||||||
}
|
|
||||||
else //if(protocol <= __constant_htons(ETH_FRAME_LEN))
|
|
||||||
{
|
|
||||||
if(!memcmp(ipx_header, framePtr, 2))
|
|
||||||
{
|
|
||||||
DBG_871X("NAT25: Protocol=IPX (Ethernet 802.3)\n");
|
|
||||||
ipx = (struct ipxhdr *)framePtr;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
unsigned char ipx_8022_type = 0xE0;
|
|
||||||
unsigned char snap_8022_type = 0xAA;
|
|
||||||
|
|
||||||
if(*framePtr == snap_8022_type)
|
|
||||||
{
|
|
||||||
unsigned char ipx_snap_id[5] = {0x0, 0x0, 0x0, 0x81, 0x37}; // IPX SNAP ID
|
|
||||||
unsigned char aarp_snap_id[5] = {0x00, 0x00, 0x00, 0x80, 0xF3}; // Apple Talk AARP SNAP ID
|
|
||||||
unsigned char ddp_snap_id[5] = {0x08, 0x00, 0x07, 0x80, 0x9B}; // Apple Talk DDP SNAP ID
|
|
||||||
|
|
||||||
framePtr += 3; // eliminate the 802.2 header
|
|
||||||
|
|
||||||
if(!memcmp(ipx_snap_id, framePtr, 5))
|
|
||||||
{
|
|
||||||
framePtr += 5; // eliminate the SNAP header
|
|
||||||
|
|
||||||
DBG_871X("NAT25: Protocol=IPX (Ethernet SNAP)\n");
|
|
||||||
ipx = (struct ipxhdr *)framePtr;
|
|
||||||
}
|
|
||||||
else if(!memcmp(aarp_snap_id, framePtr, 5))
|
|
||||||
{
|
|
||||||
framePtr += 5; // eliminate the SNAP header
|
|
||||||
|
|
||||||
ea = (struct elapaarp *)framePtr;
|
|
||||||
}
|
|
||||||
else if(!memcmp(ddp_snap_id, framePtr, 5))
|
|
||||||
{
|
|
||||||
framePtr += 5; // eliminate the SNAP header
|
|
||||||
|
|
||||||
ddp = (struct ddpehdr *)framePtr;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
DEBUG_WARN("NAT25: Protocol=Ethernet SNAP %02x%02x%02x%02x%02x\n", framePtr[0],
|
|
||||||
framePtr[1], framePtr[2], framePtr[3], framePtr[4]);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if(*framePtr == ipx_8022_type)
|
|
||||||
{
|
|
||||||
framePtr += 3; // eliminate the 802.2 header
|
|
||||||
|
|
||||||
if(!memcmp(ipx_header, framePtr, 2))
|
|
||||||
{
|
|
||||||
DBG_871X("NAT25: Protocol=IPX (Ethernet 802.2)\n");
|
|
||||||
ipx = (struct ipxhdr *)framePtr;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* IPX */
|
|
||||||
if(ipx != NULL)
|
|
||||||
{
|
|
||||||
switch(method)
|
|
||||||
{
|
|
||||||
case NAT25_CHECK:
|
|
||||||
if(!memcmp(skb->data+ETH_ALEN, ipx->ipx_source.node, ETH_ALEN))
|
|
||||||
{
|
|
||||||
DBG_871X("NAT25: Check IPX skb_copy\n");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
case NAT25_INSERT:
|
|
||||||
{
|
|
||||||
DBG_871X("NAT25: Insert IPX, Dest=%08x,%02x%02x%02x%02x%02x%02x,%04x Source=%08x,%02x%02x%02x%02x%02x%02x,%04x\n",
|
|
||||||
ipx->ipx_dest.net,
|
|
||||||
ipx->ipx_dest.node[0],
|
|
||||||
ipx->ipx_dest.node[1],
|
|
||||||
ipx->ipx_dest.node[2],
|
|
||||||
ipx->ipx_dest.node[3],
|
|
||||||
ipx->ipx_dest.node[4],
|
|
||||||
ipx->ipx_dest.node[5],
|
|
||||||
ipx->ipx_dest.sock,
|
|
||||||
ipx->ipx_source.net,
|
|
||||||
ipx->ipx_source.node[0],
|
|
||||||
ipx->ipx_source.node[1],
|
|
||||||
ipx->ipx_source.node[2],
|
|
||||||
ipx->ipx_source.node[3],
|
|
||||||
ipx->ipx_source.node[4],
|
|
||||||
ipx->ipx_source.node[5],
|
|
||||||
ipx->ipx_source.sock);
|
|
||||||
|
|
||||||
if(!memcmp(skb->data+ETH_ALEN, ipx->ipx_source.node, ETH_ALEN))
|
|
||||||
{
|
|
||||||
DBG_871X("NAT25: Use IPX Net, and Socket as network addr\n");
|
|
||||||
|
|
||||||
__nat25_generate_ipx_network_addr_with_socket(networkAddr, &ipx->ipx_source.net, &ipx->ipx_source.sock);
|
|
||||||
|
|
||||||
// change IPX source node addr to wlan STA address
|
|
||||||
memcpy(ipx->ipx_source.node, GET_MY_HWADDR(priv), ETH_ALEN);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
__nat25_generate_ipx_network_addr_with_node(networkAddr, &ipx->ipx_source.net, ipx->ipx_source.node);
|
|
||||||
}
|
|
||||||
|
|
||||||
__nat25_db_network_insert(priv, skb->data+ETH_ALEN, networkAddr);
|
|
||||||
|
|
||||||
__nat25_db_print(priv);
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
case NAT25_LOOKUP:
|
|
||||||
{
|
|
||||||
if(!memcmp(GET_MY_HWADDR(priv), ipx->ipx_dest.node, ETH_ALEN))
|
|
||||||
{
|
|
||||||
DBG_871X("NAT25: Lookup IPX, Modify Destination IPX Node addr\n");
|
|
||||||
|
|
||||||
__nat25_generate_ipx_network_addr_with_socket(networkAddr, &ipx->ipx_dest.net, &ipx->ipx_dest.sock);
|
|
||||||
|
|
||||||
__nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
|
|
||||||
|
|
||||||
// replace IPX destination node addr with Lookup destination MAC addr
|
|
||||||
memcpy(ipx->ipx_dest.node, skb->data, ETH_ALEN);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
__nat25_generate_ipx_network_addr_with_node(networkAddr, &ipx->ipx_dest.net, ipx->ipx_dest.node);
|
|
||||||
|
|
||||||
__nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
default:
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* AARP */
|
/* AARP */
|
||||||
else if(ea != NULL)
|
if(ea != NULL)
|
||||||
{
|
{
|
||||||
/* Sanity check fields. */
|
/* Sanity check fields. */
|
||||||
if(ea->hw_len != ETH_ALEN || ea->pa_len != AARP_PA_ALEN)
|
if(ea->hw_len != ETH_ALEN || ea->pa_len != AARP_PA_ALEN)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue