[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d638cffb3531f3ab2eb97a5907ee38f16e755171 - IPFire-SCM

30 Nov 2021

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
       via  d638cffb3531f3ab2eb97a5907ee38f16e755171 (commit)
      from  11a3bd48989b7009d057d882d300c9c17e42c08c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d638cffb3531f3ab2eb97a5907ee38f16e755171
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Tue Nov 30 14:12:08 2021 +0100
rtl8812au: update to git-307d694...
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 lfs/rtl8812au                          |   7 +-
 src/patches/rtl8812au/remove-ipx.patch | 280 ---------------------------------
 2 files changed, 3 insertions(+), 284 deletions(-)
 delete mode 100644 src/patches/rtl8812au/remove-ipx.patch
Difference in files:

diff --git a/lfs/rtl8812au b/lfs/rtl8812au
index 50f35330f..c458db427 100644
--- a/lfs/rtl8812au
+++ b/lfs/rtl8812au
@@ -27,10 +27,10 @@ include Config
 VERSUFIX = ipfire$(KCFG)
 MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/extra/wlan
-VER        = 0b87ed921a8682856aed5a3e68344b0087f3c93c
+VER        = 307d694076b056588c652c2bdaa543a89eb255d9
THISAPP    = rtl8812au-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = bb7a0c4a9c60ff1bcbaf1071feecf503
+$(DL_FILE)_MD5 = 6492b071bcf3a8c04c4dd69012fdf92d
install : $(TARGET)
@@ -77,7 +77,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
    cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/rtl8812au/enable_usbmodeswitch.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/rtl8812au/remove-ipx.patch
    cd $(DIR_APP) && CONFIG_88XXAU=m make $(MAKETUNING) \
    	-C /lib/modules/$(KVER)-$(VERSUFIX)/build/ M=$(DIR_APP)/ modules
diff --git a/src/patches/rtl8812au/remove-ipx.patch b/src/patches/rtl8812au/remove-ipx.patch
deleted file mode 100644
index 4bcb6d1dd..000000000
--- a/src/patches/rtl8812au/remove-ipx.patch
+++ /dev/null
@@ -1,280 +0,0 @@
-diff -Naur rtl8812au-0b87ed921a8682856aed5a3e68344b0087f3c93c.org/core/rtw_br_ext.c rtl8812au-0b87ed921a8682856aed5a3e68344b0087f3c93c/core/rtw_br_ext.c
---- rtl8812au-0b87ed921a8682856aed5a3e68344b0087f3c93c.org/core/rtw_br_ext.c	2021-05-21 22:58:44.000000000 +0200
-+++ rtl8812au-0b87ed921a8682856aed5a3e68344b0087f3c93c/core/rtw_br_ext.c	2021-11-04 18:54:19.917603371 +0100
-@@ -17,7 +17,6 @@
- #ifdef __KERNEL__
- 	#include <linux/if_arp.h>
- 	#include <net/ip.h>
--	#include <net/ipx.h>
- 	#include <linux/atalk.h>
- 	#include <linux/udp.h>
- 	#include <linux/if_pppox.h>
-@@ -168,40 +167,6 @@
- 	memcpy(networkAddr + 7, (unsigned char *)ipAddr, 4);
- }
- 
--
--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,
--		unsigned short *network, unsigned char *node)
--{
--	memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
--
--	networkAddr[0] = NAT25_APPLE;
--	memcpy(networkAddr + 1, (unsigned char *)network, 2);
--	networkAddr[3] = *node;
--}
--
--
- static __inline__ void __nat25_generate_pppoe_network_addr(unsigned char *networkAddr,
- 		unsigned char *ac_mac, unsigned short *sid)
- {
-@@ -890,227 +855,6 @@
- 	}
- 
- 	/*---------------------------------------------------*/
--	/*         Handle IPX and Apple Talk frame          */
--	/*---------------------------------------------------*/
--	else if ((protocol == __constant_htons(ETH_P_IPX)) ||
--		 (protocol == __constant_htons(ETH_P_ATALK)) ||
--		 (protocol == __constant_htons(ETH_P_AARP))) {
--		unsigned char ipx_header[2] = {0xFF, 0xFF};
--		struct ipxhdr	*ipx = NULL;
--		struct elapaarp	*ea = NULL;
--		struct ddpehdr	*ddp = NULL;
--		unsigned char *framePtr = skb->data + ETH_HLEN;
--
--		if (protocol == __constant_htons(ETH_P_IPX)) {
--			RTW_INFO("NAT25: Protocol=IPX (Ethernet II)\n");
--			ipx = (struct ipxhdr *)framePtr;
--		} else { /* if(protocol <= __constant_htons(ETH_FRAME_LEN)) */
--			if (!memcmp(ipx_header, framePtr, 2)) {
--				RTW_INFO("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 */
--
--						RTW_INFO("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)) {
--						RTW_INFO("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)) {
--					RTW_INFO("NAT25: Check IPX skb_copy\n");
--					return 0;
--				}
--				return -1;
--
--			case NAT25_INSERT: {
--				RTW_INFO("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)) {
--					RTW_INFO("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)) {
--					RTW_INFO("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  */
--		else if (ea != NULL) {
--			/* Sanity check fields. */
--			if (ea->hw_len != ETH_ALEN || ea->pa_len != AARP_PA_ALEN) {
--				DEBUG_WARN("NAT25: Appletalk AARP Sanity check fail!\n");
--				return -1;
--			}
--
--			switch (method) {
--			case NAT25_CHECK:
--				return 0;
--
--			case NAT25_INSERT: {
--				/* change to AARP source mac address to wlan STA address */
--				memcpy(ea->hw_src, GET_MY_HWADDR(priv), ETH_ALEN);
--
--				RTW_INFO("NAT25: Insert AARP, Source=%d,%d Destination=%d,%d\n",
--					 ea->pa_src_net,
--					 ea->pa_src_node,
--					 ea->pa_dst_net,
--					 ea->pa_dst_node);
--
--				__nat25_generate_apple_network_addr(networkAddr, &ea->pa_src_net, &ea->pa_src_node);
--
--				__nat25_db_network_insert(priv, skb->data + ETH_ALEN, networkAddr);
--
--				__nat25_db_print(priv);
--			}
--			return 0;
--
--			case NAT25_LOOKUP: {
--				RTW_INFO("NAT25: Lookup AARP, Source=%d,%d Destination=%d,%d\n",
--					 ea->pa_src_net,
--					 ea->pa_src_node,
--					 ea->pa_dst_net,
--					 ea->pa_dst_node);
--
--				__nat25_generate_apple_network_addr(networkAddr, &ea->pa_dst_net, &ea->pa_dst_node);
--
--				__nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
--
--				/* change to AARP destination mac address to Lookup result */
--				memcpy(ea->hw_dst, skb->data, ETH_ALEN);
--			}
--			return 0;
--
--			default:
--				return -1;
--			}
--		}
--
--		/*   DDP  */
--		else if (ddp != NULL) {
--			switch (method) {
--			case NAT25_CHECK:
--				return -1;
--
--			case NAT25_INSERT: {
--				RTW_INFO("NAT25: Insert DDP, Source=%d,%d Destination=%d,%d\n",
--					 ddp->deh_snet,
--					 ddp->deh_snode,
--					 ddp->deh_dnet,
--					 ddp->deh_dnode);
--
--				__nat25_generate_apple_network_addr(networkAddr, &ddp->deh_snet, &ddp->deh_snode);
--
--				__nat25_db_network_insert(priv, skb->data + ETH_ALEN, networkAddr);
--
--				__nat25_db_print(priv);
--			}
--			return 0;
--
--			case NAT25_LOOKUP: {
--				RTW_INFO("NAT25: Lookup DDP, Source=%d,%d Destination=%d,%d\n",
--					 ddp->deh_snet,
--					 ddp->deh_snode,
--					 ddp->deh_dnet,
--					 ddp->deh_dnode);
--
--				__nat25_generate_apple_network_addr(networkAddr, &ddp->deh_dnet, &ddp->deh_dnode);
--
--				__nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
--			}
--			return 0;
--
--			default:
--				return -1;
--			}
--		}
--
--		return -1;
--	}
--
--	/*---------------------------------------------------*/
- 	/*                Handle PPPoE frame                */
- 	/*---------------------------------------------------*/
- 	else if ((protocol == __constant_htons(ETH_P_PPP_DISC)) ||
hooks/post-receive
--
IPFire 2.x development tree

    