Merge branch 'MeIsReallyBa:main' into main

liqideqq · Nov 27, 2023 · e6f6795 · e6f6795
2 parents ff3f7b6 + 4179a3d
commit e6f6795
Show file tree

Hide file tree

Showing 537 changed files with 377,806 additions and 386,544 deletions.
diff --git a/trunk/configs/boards/B70/kernel-4.4.x.config b/trunk/configs/boards/B70/kernel-4.4.x.config
@@ -953,46 +953,8 @@ CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
 # CONFIG_NFC is not set
 # CONFIG_LWTUNNEL is not set
 CONFIG_HW_NAT=y
-# CONFIG_RA_NAT_NONE is not set
-CONFIG_RA_NAT_HW=y
-CONFIG_RA_HW_NAT=m
-CONFIG_RA_HW_NAT_LAN_VLANID=1
-CONFIG_RA_HW_NAT_WAN_VLANID=2
-CONFIG_RA_HW_NAT_BINDING_THRESHOLD=30
-# CONFIG_RA_HW_NAT_TBL_1K is not set
-# CONFIG_RA_HW_NAT_TBL_2K is not set
-# CONFIG_RA_HW_NAT_TBL_4K is not set
-# CONFIG_RA_HW_NAT_TBL_8K is not set
-CONFIG_RA_HW_NAT_TBL_16K=y
-CONFIG_HNAT_V2=y
-# CONFIG_RA_HW_NAT_HASH0 is not set
-CONFIG_RA_HW_NAT_HASH1=y
-# CONFIG_RA_HW_NAT_HASH2 is not set
-# CONFIG_RA_HW_NAT_HASH3 is not set
-CONFIG_HW_NAT_AUTO_MODE=y
-# CONFIG_HW_NAT_SEMI_AUTO_MODE is not set
-# CONFIG_HW_NAT_MANUAL_MODE is not set
-CONFIG_RA_HW_NAT_TCP_KA=1
-CONFIG_RA_HW_NAT_UDP_KA=1
-CONFIG_RA_HW_NAT_NTU_KA=1
-CONFIG_RA_HW_NAT_UNB_DLTA=3
-CONFIG_RA_HW_NAT_UNB_MNP=1000
-CONFIG_RA_HW_NAT_UDP_DLTA=5
-CONFIG_RA_HW_NAT_TCP_DLTA=5
-CONFIG_RA_HW_NAT_FIN_DLTA=5
-CONFIG_RA_HW_NAT_NTU_DLTA=5
-CONFIG_RA_HW_NAT_IPV6=y
-# CONFIG_RA_HW_NAT_PREBIND is not set
-# CONFIG_PPE_MCAST is not set
-CONFIG_RA_HW_NAT_WIFI=y
-CONFIG_RA_HW_NAT_WIFI_NEW_ARCH=y
-# CONFIG_RA_HW_NAT_NIC_USB is not set
-# CONFIG_RA_HW_NAT_PPTP_L2TP is not set
-# CONFIG_RA_HW_NAT_ACCNT_MAINTAINER is not set
-# CONFIG_QDMA_SUPPORT_QOS is not set
-# CONFIG_WAN_TO_WLAN_SUPPORT_QOS is not set
-# CONFIG_SUPPORT_WLAN_OPTIMIZE is not set
-# CONFIG_HW_NAT_IPI is not set
+CONFIG_RA_NAT_NONE=y
+# CONFIG_RA_NAT_HW is not set
 CONFIG_SHORTCUT_FE=y
 CONFIG_DST_CACHE=y
 CONFIG_HAVE_BPF_JIT=y
@@ -1435,8 +1397,8 @@ CONFIG_ETHERNET=y
 CONFIG_RAETH=y
 # CONFIG_GE1_SGMII_FORCE_2500 is not set
 CONFIG_ETH_SKB_ALLOC_SELECT=y
-CONFIG_ETH_SLAB_ALLOC_SKB=y
-# CONFIG_ETH_PAGE_ALLOC_SKB is not set
+# CONFIG_ETH_SLAB_ALLOC_SKB is not set
+CONFIG_ETH_PAGE_ALLOC_SKB=y
 CONFIG_RAETH_ESW_CONTROL=y
 CONFIG_RAETH_ESW_PORT_WAN=4
 CONFIG_RAETH_ESW_PORT_LAN1=1

diff --git a/trunk/configs/boards/BELL-A040WQ/kernel-4.4.x.config b/trunk/configs/boards/BELL-A040WQ/kernel-4.4.x.config
@@ -948,46 +948,9 @@ CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
 # CONFIG_NFC is not set
 # CONFIG_LWTUNNEL is not set
 CONFIG_HW_NAT=y
-# CONFIG_RA_NAT_NONE is not set
-CONFIG_RA_NAT_HW=y
-CONFIG_RA_HW_NAT=m
-CONFIG_RA_HW_NAT_LAN_VLANID=1
-CONFIG_RA_HW_NAT_WAN_VLANID=2
-CONFIG_RA_HW_NAT_BINDING_THRESHOLD=30
-# CONFIG_RA_HW_NAT_TBL_1K is not set
-# CONFIG_RA_HW_NAT_TBL_2K is not set
-# CONFIG_RA_HW_NAT_TBL_4K is not set
-# CONFIG_RA_HW_NAT_TBL_8K is not set
-CONFIG_RA_HW_NAT_TBL_16K=y
-CONFIG_HNAT_V2=y
-# CONFIG_RA_HW_NAT_HASH0 is not set
-CONFIG_RA_HW_NAT_HASH1=y
-# CONFIG_RA_HW_NAT_HASH2 is not set
-# CONFIG_RA_HW_NAT_HASH3 is not set
-CONFIG_HW_NAT_AUTO_MODE=y
-# CONFIG_HW_NAT_SEMI_AUTO_MODE is not set
-# CONFIG_HW_NAT_MANUAL_MODE is not set
-CONFIG_RA_HW_NAT_TCP_KA=1
-CONFIG_RA_HW_NAT_UDP_KA=1
-CONFIG_RA_HW_NAT_NTU_KA=1
-CONFIG_RA_HW_NAT_UNB_DLTA=3
-CONFIG_RA_HW_NAT_UNB_MNP=1000
-CONFIG_RA_HW_NAT_UDP_DLTA=5
-CONFIG_RA_HW_NAT_TCP_DLTA=5
-CONFIG_RA_HW_NAT_FIN_DLTA=5
-CONFIG_RA_HW_NAT_NTU_DLTA=5
-CONFIG_RA_HW_NAT_IPV6=y
-# CONFIG_RA_HW_NAT_PREBIND is not set
-# CONFIG_PPE_MCAST is not set
-CONFIG_RA_HW_NAT_WIFI=y
-CONFIG_RA_HW_NAT_WIFI_NEW_ARCH=y
-# CONFIG_RA_HW_NAT_NIC_USB is not set
-# CONFIG_RA_HW_NAT_PPTP_L2TP is not set
-# CONFIG_RA_HW_NAT_ACCNT_MAINTAINER is not set
-# CONFIG_QDMA_SUPPORT_QOS is not set
-# CONFIG_WAN_TO_WLAN_SUPPORT_QOS is not set
-# CONFIG_SUPPORT_WLAN_OPTIMIZE is not set
-# CONFIG_HW_NAT_IPI is not set
+CONFIG_RA_NAT_NONE=y
+# CONFIG_RA_NAT_HW is not set
+CONFIG_SHORTCUT_FE=y
 # CONFIG_SHORTCUT_FE is not set
 CONFIG_DST_CACHE=y
 CONFIG_HAVE_BPF_JIT=y
@@ -1429,8 +1392,8 @@ CONFIG_ETHERNET=y
 CONFIG_RAETH=y
 # CONFIG_GE1_SGMII_FORCE_2500 is not set
 CONFIG_ETH_SKB_ALLOC_SELECT=y
-CONFIG_ETH_SLAB_ALLOC_SKB=y
-# CONFIG_ETH_PAGE_ALLOC_SKB is not set
+# CONFIG_ETH_SLAB_ALLOC_SKB is not set
+CONFIG_ETH_PAGE_ALLOC_SKB=y
 CONFIG_RAETH_ESW_CONTROL=y
 CONFIG_RAETH_ESW_PORT_WAN=4
 CONFIG_RAETH_ESW_PORT_LAN1=3
@@ -1614,7 +1577,7 @@ CONFIG_DEFAULT_5G_PROFILE=y
 # CONFIG_WSC_V2_SUPPORT is not set
 CONFIG_DOT11W_PMF_SUPPORT=y
 CONFIG_TXBF_SUPPORT=y
-CONFIG_FAST_NAT_SUPPORT=y
+# CONFIG_FAST_NAT_SUPPORT is not set
 # CONFIG_WHNAT_SUPPORT is not set
 # CONFIG_FTM_SUPPORT is not set
 # CONFIG_MBO_SUPPORT is not set

diff --git a/trunk/configs/boards/CR660x/kernel-4.4.x.config b/trunk/configs/boards/CR660x/kernel-4.4.x.config
@@ -947,46 +947,8 @@ CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
 # CONFIG_NFC is not set
 # CONFIG_LWTUNNEL is not set
 CONFIG_HW_NAT=y
-# CONFIG_RA_NAT_NONE is not set
-CONFIG_RA_NAT_HW=y
-CONFIG_RA_HW_NAT=m
-CONFIG_RA_HW_NAT_LAN_VLANID=1
-CONFIG_RA_HW_NAT_WAN_VLANID=2
-CONFIG_RA_HW_NAT_BINDING_THRESHOLD=30
-# CONFIG_RA_HW_NAT_TBL_1K is not set
-# CONFIG_RA_HW_NAT_TBL_2K is not set
-# CONFIG_RA_HW_NAT_TBL_4K is not set
-# CONFIG_RA_HW_NAT_TBL_8K is not set
-CONFIG_RA_HW_NAT_TBL_16K=y
-CONFIG_HNAT_V2=y
-# CONFIG_RA_HW_NAT_HASH0 is not set
-CONFIG_RA_HW_NAT_HASH1=y
-# CONFIG_RA_HW_NAT_HASH2 is not set
-# CONFIG_RA_HW_NAT_HASH3 is not set
-CONFIG_HW_NAT_AUTO_MODE=y
-# CONFIG_HW_NAT_SEMI_AUTO_MODE is not set
-# CONFIG_HW_NAT_MANUAL_MODE is not set
-CONFIG_RA_HW_NAT_TCP_KA=1
-CONFIG_RA_HW_NAT_UDP_KA=1
-CONFIG_RA_HW_NAT_NTU_KA=1
-CONFIG_RA_HW_NAT_UNB_DLTA=3
-CONFIG_RA_HW_NAT_UNB_MNP=1000
-CONFIG_RA_HW_NAT_UDP_DLTA=5
-CONFIG_RA_HW_NAT_TCP_DLTA=5
-CONFIG_RA_HW_NAT_FIN_DLTA=5
-CONFIG_RA_HW_NAT_NTU_DLTA=5
-CONFIG_RA_HW_NAT_IPV6=y
-# CONFIG_RA_HW_NAT_PREBIND is not set
-# CONFIG_PPE_MCAST is not set
-CONFIG_RA_HW_NAT_WIFI=y
-CONFIG_RA_HW_NAT_WIFI_NEW_ARCH=y
-# CONFIG_RA_HW_NAT_NIC_USB is not set
-# CONFIG_RA_HW_NAT_PPTP_L2TP is not set
-# CONFIG_RA_HW_NAT_ACCNT_MAINTAINER is not set
-# CONFIG_QDMA_SUPPORT_QOS is not set
-# CONFIG_WAN_TO_WLAN_SUPPORT_QOS is not set
-# CONFIG_SUPPORT_WLAN_OPTIMIZE is not set
-# CONFIG_HW_NAT_IPI is not set
+CONFIG_RA_NAT_NONE=y
+# CONFIG_RA_NAT_HW is not set
 # CONFIG_SHORTCUT_FE is not set
 CONFIG_DST_CACHE=y
 CONFIG_HAVE_BPF_JIT=y
@@ -1395,8 +1357,8 @@ CONFIG_ETHERNET=y
 CONFIG_RAETH=y
 # CONFIG_GE1_SGMII_FORCE_2500 is not set
 CONFIG_ETH_SKB_ALLOC_SELECT=y
-CONFIG_ETH_SLAB_ALLOC_SKB=y
-# CONFIG_ETH_PAGE_ALLOC_SKB is not set
+# CONFIG_ETH_SLAB_ALLOC_SKB is not set
+CONFIG_ETH_PAGE_ALLOC_SKB=y
 CONFIG_RAETH_ESW_CONTROL=y
 CONFIG_RAETH_ESW_PORT_WAN=4
 CONFIG_RAETH_ESW_PORT_LAN1=0
@@ -1497,7 +1459,7 @@ CONFIG_MULTI_PROFILE_SUPPORT=y
 # CONFIG_WSC_V2_SUPPORT is not set
 CONFIG_DOT11W_PMF_SUPPORT=y
 CONFIG_TXBF_SUPPORT=y
-CONFIG_FAST_NAT_SUPPORT=y
+# CONFIG_FAST_NAT_SUPPORT is not set
 # CONFIG_WHNAT_SUPPORT is not set
 # CONFIG_FTM_SUPPORT is not set
 # CONFIG_MBO_SUPPORT is not set

diff --git a/trunk/configs/boards/DIR-878/kernel-4.4.x.config b/trunk/configs/boards/DIR-878/kernel-4.4.x.config
@@ -947,46 +947,8 @@ CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
 # CONFIG_NFC is not set
 # CONFIG_LWTUNNEL is not set
 CONFIG_HW_NAT=y
-# CONFIG_RA_NAT_NONE is not set
-CONFIG_RA_NAT_HW=y
-CONFIG_RA_HW_NAT=m
-CONFIG_RA_HW_NAT_LAN_VLANID=1
-CONFIG_RA_HW_NAT_WAN_VLANID=2
-CONFIG_RA_HW_NAT_BINDING_THRESHOLD=30
-# CONFIG_RA_HW_NAT_TBL_1K is not set
-# CONFIG_RA_HW_NAT_TBL_2K is not set
-# CONFIG_RA_HW_NAT_TBL_4K is not set
-# CONFIG_RA_HW_NAT_TBL_8K is not set
-CONFIG_RA_HW_NAT_TBL_16K=y
-CONFIG_HNAT_V2=y
-# CONFIG_RA_HW_NAT_HASH0 is not set
-CONFIG_RA_HW_NAT_HASH1=y
-# CONFIG_RA_HW_NAT_HASH2 is not set
-# CONFIG_RA_HW_NAT_HASH3 is not set
-CONFIG_HW_NAT_AUTO_MODE=y
-# CONFIG_HW_NAT_SEMI_AUTO_MODE is not set
-# CONFIG_HW_NAT_MANUAL_MODE is not set
-CONFIG_RA_HW_NAT_TCP_KA=1
-CONFIG_RA_HW_NAT_UDP_KA=1
-CONFIG_RA_HW_NAT_NTU_KA=1
-CONFIG_RA_HW_NAT_UNB_DLTA=3
-CONFIG_RA_HW_NAT_UNB_MNP=1000
-CONFIG_RA_HW_NAT_UDP_DLTA=5
-CONFIG_RA_HW_NAT_TCP_DLTA=5
-CONFIG_RA_HW_NAT_FIN_DLTA=5
-CONFIG_RA_HW_NAT_NTU_DLTA=5
-CONFIG_RA_HW_NAT_IPV6=y
-# CONFIG_RA_HW_NAT_PREBIND is not set
-# CONFIG_PPE_MCAST is not set
-CONFIG_RA_HW_NAT_WIFI=y
-CONFIG_RA_HW_NAT_WIFI_NEW_ARCH=y
-# CONFIG_RA_HW_NAT_NIC_USB is not set
-# CONFIG_RA_HW_NAT_PPTP_L2TP is not set
-# CONFIG_RA_HW_NAT_ACCNT_MAINTAINER is not set
-# CONFIG_QDMA_SUPPORT_QOS is not set
-# CONFIG_WAN_TO_WLAN_SUPPORT_QOS is not set
-# CONFIG_SUPPORT_WLAN_OPTIMIZE is not set
-# CONFIG_HW_NAT_IPI is not set
+CONFIG_RA_NAT_NONE=y
+# CONFIG_RA_NAT_HW is not set
 # CONFIG_SHORTCUT_FE is not set
 CONFIG_DST_CACHE=y
 CONFIG_HAVE_BPF_JIT=y
@@ -1386,8 +1348,8 @@ CONFIG_ETHERNET=y
 CONFIG_RAETH=y
 # CONFIG_GE1_SGMII_FORCE_2500 is not set
 CONFIG_ETH_SKB_ALLOC_SELECT=y
-CONFIG_ETH_SLAB_ALLOC_SKB=y
-# CONFIG_ETH_PAGE_ALLOC_SKB is not set
+# CONFIG_ETH_SLAB_ALLOC_SKB is not set
+CONFIG_ETH_PAGE_ALLOC_SKB=y
 CONFIG_RAETH_ESW_CONTROL=y
 CONFIG_RAETH_ESW_PORT_WAN=4
 CONFIG_RAETH_ESW_PORT_LAN1=3
@@ -1503,7 +1465,7 @@ CONFIG_HDR_TRANS_RX_SUPPORT=y
 # CONFIG_WSC_V2_SUPPORT is not set
 CONFIG_DOT11W_PMF_SUPPORT=y
 CONFIG_TXBF_SUPPORT=y
-CONFIG_FAST_NAT_SUPPORT=y
+# CONFIG_FAST_NAT_SUPPORT is not set
 # CONFIG_WHNAT_SUPPORT is not set
 # CONFIG_FTM_SUPPORT is not set
 # CONFIG_MBO_SUPPORT is not set

diff --git a/trunk/configs/boards/DIR-882/kernel-4.4.x.config b/trunk/configs/boards/DIR-882/kernel-4.4.x.config
@@ -947,46 +947,8 @@ CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
 # CONFIG_NFC is not set
 # CONFIG_LWTUNNEL is not set
 CONFIG_HW_NAT=y
-# CONFIG_RA_NAT_NONE is not set
-CONFIG_RA_NAT_HW=y
-CONFIG_RA_HW_NAT=m
-CONFIG_RA_HW_NAT_LAN_VLANID=1
-CONFIG_RA_HW_NAT_WAN_VLANID=2
-CONFIG_RA_HW_NAT_BINDING_THRESHOLD=30
-# CONFIG_RA_HW_NAT_TBL_1K is not set
-# CONFIG_RA_HW_NAT_TBL_2K is not set
-# CONFIG_RA_HW_NAT_TBL_4K is not set
-# CONFIG_RA_HW_NAT_TBL_8K is not set
-CONFIG_RA_HW_NAT_TBL_16K=y
-CONFIG_HNAT_V2=y
-# CONFIG_RA_HW_NAT_HASH0 is not set
-CONFIG_RA_HW_NAT_HASH1=y
-# CONFIG_RA_HW_NAT_HASH2 is not set
-# CONFIG_RA_HW_NAT_HASH3 is not set
-CONFIG_HW_NAT_AUTO_MODE=y
-# CONFIG_HW_NAT_SEMI_AUTO_MODE is not set
-# CONFIG_HW_NAT_MANUAL_MODE is not set
-CONFIG_RA_HW_NAT_TCP_KA=1
-CONFIG_RA_HW_NAT_UDP_KA=1
-CONFIG_RA_HW_NAT_NTU_KA=1
-CONFIG_RA_HW_NAT_UNB_DLTA=3
-CONFIG_RA_HW_NAT_UNB_MNP=1000
-CONFIG_RA_HW_NAT_UDP_DLTA=5
-CONFIG_RA_HW_NAT_TCP_DLTA=5
-CONFIG_RA_HW_NAT_FIN_DLTA=5
-CONFIG_RA_HW_NAT_NTU_DLTA=5
-CONFIG_RA_HW_NAT_IPV6=y
-# CONFIG_RA_HW_NAT_PREBIND is not set
-# CONFIG_PPE_MCAST is not set
-CONFIG_RA_HW_NAT_WIFI=y
-CONFIG_RA_HW_NAT_WIFI_NEW_ARCH=y
-# CONFIG_RA_HW_NAT_NIC_USB is not set
-# CONFIG_RA_HW_NAT_PPTP_L2TP is not set
-# CONFIG_RA_HW_NAT_ACCNT_MAINTAINER is not set
-# CONFIG_QDMA_SUPPORT_QOS is not set
-# CONFIG_WAN_TO_WLAN_SUPPORT_QOS is not set
-# CONFIG_SUPPORT_WLAN_OPTIMIZE is not set
-# CONFIG_HW_NAT_IPI is not set
+CONFIG_RA_NAT_NONE=y
+# CONFIG_RA_NAT_HW is not set
 # CONFIG_SHORTCUT_FE is not set
 CONFIG_DST_CACHE=y
 CONFIG_HAVE_BPF_JIT=y
@@ -1419,8 +1381,8 @@ CONFIG_ETHERNET=y
 CONFIG_RAETH=y
 # CONFIG_GE1_SGMII_FORCE_2500 is not set
 CONFIG_ETH_SKB_ALLOC_SELECT=y
-CONFIG_ETH_SLAB_ALLOC_SKB=y
-# CONFIG_ETH_PAGE_ALLOC_SKB is not set
+# CONFIG_ETH_SLAB_ALLOC_SKB is not set
+CONFIG_ETH_PAGE_ALLOC_SKB=y
 CONFIG_RAETH_ESW_CONTROL=y
 CONFIG_RAETH_ESW_PORT_WAN=4
 CONFIG_RAETH_ESW_PORT_LAN1=3
@@ -1609,7 +1571,7 @@ CONFIG_HDR_TRANS_RX_SUPPORT=y
 # CONFIG_WSC_V2_SUPPORT is not set
 CONFIG_DOT11W_PMF_SUPPORT=y
 CONFIG_TXBF_SUPPORT=y
-CONFIG_FAST_NAT_SUPPORT=y
+# CONFIG_FAST_NAT_SUPPORT is not set
 # CONFIG_WHNAT_SUPPORT is not set
 # CONFIG_FTM_SUPPORT is not set
 # CONFIG_MBO_SUPPORT is not set