him411/nss-packages-qosmio
1
0
Fork 0
mirror of https://github.com/qosmio/nss-packages.git synced 2025-12-17 00:33:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

nss-ecm: compat with NSS FW < 12.5

Browse Source 
NSS_IPV4_RULE_CREATE_RAWIP_VALID is only found in NSS FW 12.5 and
higher. Check if enabled before and macros for it.

Signed-off-by: Sean Khan <datapronix@protonmail.com>
This commit is contained in:
Sean Khan 2024-09-18 21:38:13 -04:00
parent aba99bef05
commit aa57d9c482
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qca-nss-ecm/Makefile
View File

@ -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
View 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;