mirror of
https://github.com/breeze303/nss-packages.git
synced 2025-12-16 08:44:52 +00:00
Merge remote-tracking branch 'qos/NSS-12.5-K6.x' into NSS-12.5-K6.x
This commit is contained in:
commit
ea2caa71e2
@ -5,7 +5,7 @@ comment "Build Options"
|
|||||||
|
|
||||||
choice
|
choice
|
||||||
prompt "Memory Profile"
|
prompt "Memory Profile"
|
||||||
default NSS_MEM_PROFILE_MEDIUM
|
default NSS_MEM_PROFILE_HIGH
|
||||||
help
|
help
|
||||||
This option allows you to select the memory profile.
|
This option allows you to select the memory profile.
|
||||||
It should correspond to the total RAM of your board.
|
It should correspond to the total RAM of your board.
|
||||||
@ -48,7 +48,7 @@ config NSS_DRV_CLMAP_ENABLE
|
|||||||
|
|
||||||
config NSS_DRV_CRYPTO_ENABLE
|
config NSS_DRV_CRYPTO_ENABLE
|
||||||
bool
|
bool
|
||||||
default y
|
default n
|
||||||
prompt "Enable CRYPTO"
|
prompt "Enable CRYPTO"
|
||||||
|
|
||||||
config NSS_DRV_DTLS_ENABLE
|
config NSS_DRV_DTLS_ENABLE
|
||||||
@ -90,7 +90,7 @@ config NSS_DRV_IPV4_REASM_ENABLE
|
|||||||
|
|
||||||
config NSS_DRV_IPV6_ENABLE
|
config NSS_DRV_IPV6_ENABLE
|
||||||
bool
|
bool
|
||||||
default y
|
default n
|
||||||
prompt "Enable IPV6"
|
prompt "Enable IPV6"
|
||||||
|
|
||||||
config NSS_DRV_IPV6_REASM_ENABLE
|
config NSS_DRV_IPV6_REASM_ENABLE
|
||||||
@ -146,7 +146,7 @@ config NSS_DRV_PPPOE_ENABLE
|
|||||||
|
|
||||||
config NSS_DRV_PPTP_ENABLE
|
config NSS_DRV_PPTP_ENABLE
|
||||||
bool
|
bool
|
||||||
default y
|
default n
|
||||||
prompt "Enable PPTP"
|
prompt "Enable PPTP"
|
||||||
|
|
||||||
config NSS_DRV_PVXLAN_ENABLE
|
config NSS_DRV_PVXLAN_ENABLE
|
||||||
@ -217,7 +217,7 @@ config NSS_DRV_TUNIPIP6_ENABLE
|
|||||||
|
|
||||||
config NSS_DRV_VIRT_IF_ENABLE
|
config NSS_DRV_VIRT_IF_ENABLE
|
||||||
bool
|
bool
|
||||||
default y
|
default n
|
||||||
prompt "Enable VIRT_IF"
|
prompt "Enable VIRT_IF"
|
||||||
|
|
||||||
config NSS_DRV_VLAN_ENABLE
|
config NSS_DRV_VLAN_ENABLE
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=qca-nss-ecm
|
PKG_NAME:=qca-nss-ecm
|
||||||
PKG_RELEASE:=3
|
PKG_RELEASE:=4
|
||||||
|
|
||||||
PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/qca-nss-ecm.git
|
PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/qca-nss-ecm.git
|
||||||
PKG_SOURCE_PROTO:=git
|
PKG_SOURCE_PROTO:=git
|
||||||
@ -164,6 +164,10 @@ ifneq ($(CONFIG_PACKAGE_kmod-qmi_wwan_q),)
|
|||||||
ECM_MAKE_OPTS+=ECM_INTERFACE_RAWIP_ENABLE=y
|
ECM_MAKE_OPTS+=ECM_INTERFACE_RAWIP_ENABLE=y
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifneq ($(CONFIG_NSS_FIRMWARE_VERSION_12_5),)
|
||||||
|
EXTRA_CFLAGS+=-DNSS_FIRMWARE_VERSION_12_5
|
||||||
|
endif
|
||||||
|
|
||||||
define Build/InstallDev
|
define Build/InstallDev
|
||||||
mkdir -p $(1)/usr/include/qca-nss-ecm
|
mkdir -p $(1)/usr/include/qca-nss-ecm
|
||||||
$(CP) $(PKG_BUILD_DIR)/exports/* $(1)/usr/include/qca-nss-ecm
|
$(CP) $(PKG_BUILD_DIR)/exports/* $(1)/usr/include/qca-nss-ecm
|
||||||
|
|||||||
20
qca-nss-ecm/patches/0018-ecm-compat-nss-12_2.patch
Normal file
20
qca-nss-ecm/patches/0018-ecm-compat-nss-12_2.patch
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
--- a/frontends/nss/ecm_nss_non_ported_ipv4.c
|
||||||
|
+++ b/frontends/nss/ecm_nss_non_ported_ipv4.c
|
||||||
|
@@ -855,7 +855,7 @@ static void ecm_nss_non_ported_ipv4_conn
|
||||||
|
#endif
|
||||||
|
break;
|
||||||
|
case ECM_DB_IFACE_TYPE_RAWIP:
|
||||||
|
-#ifdef ECM_INTERFACE_RAWIP_ENABLE
|
||||||
|
+#if defined(NSS_FIRMWARE_VERSION_12_5) && defined(ECM_INTERFACE_RAWIP_ENABLE)
|
||||||
|
nircm->valid_flags |= NSS_IPV4_RULE_CREATE_RAWIP_VALID;
|
||||||
|
#else
|
||||||
|
rule_invalid = true;
|
||||||
|
@@ -1072,7 +1072,7 @@ static void ecm_nss_non_ported_ipv4_conn
|
||||||
|
#endif
|
||||||
|
break;
|
||||||
|
case ECM_DB_IFACE_TYPE_RAWIP:
|
||||||
|
-#ifdef ECM_INTERFACE_RAWIP_ENABLE
|
||||||
|
+#if defined(NSS_FIRMWARE_VERSION_12_5) && defined(ECM_INTERFACE_RAWIP_ENABLE)
|
||||||
|
nircm->valid_flags |= NSS_IPV4_RULE_CREATE_RAWIP_VALID;
|
||||||
|
#else
|
||||||
|
rule_invalid = true;
|
||||||
Loading…
Reference in New Issue
Block a user