nss-ecm: Ensure NSS_IPV4_RULE_CREATE_RAWIP_VALID is only checked for NSS 12.5+

It was unconditionally setting `rule_invalid = true` for FW less than 12.5.

Signed-off-by: Sean Khan <datapronix@protonmail.com>
This commit is contained in:
Sean Khan 2025-06-03 01:57:56 -04:00
parent 2f4750a191
commit 0ba24f4c33
2 changed files with 34 additions and 20 deletions

View File

@ -1,20 +0,0 @@
--- 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;

View File

@ -0,0 +1,34 @@
--- a/frontends/nss/ecm_nss_non_ported_ipv4.c
+++ b/frontends/nss/ecm_nss_non_ported_ipv4.c
@@ -854,6 +854,7 @@ static void ecm_nss_non_ported_ipv4_conn
DEBUG_TRACE("%px: PPTP - unsupported\n", feci);
#endif
break;
+#ifdef NSS_FIRMWARE_VERSION_12_5
case ECM_DB_IFACE_TYPE_RAWIP:
#ifdef ECM_INTERFACE_RAWIP_ENABLE
nircm->valid_flags |= NSS_IPV4_RULE_CREATE_RAWIP_VALID;
@@ -862,6 +863,7 @@ static void ecm_nss_non_ported_ipv4_conn
DEBUG_TRACE("%px: RAWIP - unsupported\n", feci);
#endif
break;
+#endif
default:
DEBUG_TRACE("%px: Ignoring: %d (%s)\n", feci, ii_type, ii_name);
}
@@ -1071,6 +1073,7 @@ static void ecm_nss_non_ported_ipv4_conn
DEBUG_TRACE("%px: IPSEC - unsupported\n", feci);
#endif
break;
+#ifdef NSS_FIRMWARE_VERSION_12_5
case ECM_DB_IFACE_TYPE_RAWIP:
#ifdef ECM_INTERFACE_RAWIP_ENABLE
nircm->valid_flags |= NSS_IPV4_RULE_CREATE_RAWIP_VALID;
@@ -1079,6 +1082,7 @@ static void ecm_nss_non_ported_ipv4_conn
DEBUG_TRACE("%px: RAWIP - unsupported\n", feci);
#endif
break;
+#endif
default:
DEBUG_TRACE("%px: Ignoring: %d (%s)\n", feci, ii_type, ii_name);
}