nss-ecm: bump 12.5 release and refresh patches

Brings in the following commits from 12.5 branch:

2024-11-06 - 30fbfa4 - Fix for null dev entries in emesh-sawf.
2024-08-28 - 0718f48 - Add interface num to identify vlan device

Signed-off-by: Sean Khan <datapronix@protonmail.com>
This commit is contained in:
Sean Khan 2025-04-08 13:13:20 -04:00
parent 1bed8dab31
commit a8d4f99c91
4 changed files with 23 additions and 41 deletions

View File

@ -5,10 +5,10 @@ PKG_RELEASE:=5
PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/qca-nss-ecm.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2024-09-12
PKG_SOURCE_VERSION:=c5d8727
PKG_MIRROR_HASH:=7f8d20eff276c213cd6e923a1c435521fbe5d19fab7e1c6bfc45e7fdebd82319
QSDK_VERSION:=12.5.5
PKG_SOURCE_DATE:=2024-11-06
PKG_SOURCE_VERSION:=30fbfa4
PKG_MIRROR_HASH:=9d77fe8b74dd3b99a972b7eaa1dcf66142d73340dc4a0b667e75c17e48bd7c19
QSDK_VERSION:=12.5
PKG_VERSION:=$(QSDK_VERSION).$(subst -,.,$(PKG_SOURCE_DATE))~$(PKG_SOURCE_VERSION)
PKG_BUILD_PARALLEL:=1

View File

@ -182,17 +182,7 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
DEBUG_CHECK_MAGIC(ci, ECM_DB_CONNECTION_INSTANCE_MAGIC, "%px: magic failed\n", ci);
@@ -545,7 +547,9 @@ EXPORT_SYMBOL(ecm_db_connection_data_tot
*/
void ecm_db_connection_data_totals_update_dropped(struct ecm_db_connection_instance *ci, bool is_from, uint64_t size, uint64_t packets)
{
+#ifdef ECM_DB_ADVANCED_STATS_ENABLE
int32_t i;
+#endif
DEBUG_CHECK_MAGIC(ci, ECM_DB_CONNECTION_INSTANCE_MAGIC, "%px: magic failed\n", ci);
@@ -1539,6 +1543,7 @@ void ecm_db_connection_defunct_all(void)
@@ -1539,6 +1541,7 @@ void ecm_db_connection_defunct_all(void)
}
EXPORT_SYMBOL(ecm_db_connection_defunct_all);
@ -200,7 +190,7 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
/*
* ecm_db_connection_defunct_by_classifier()
* Make defunct based on masked fields
@@ -1705,6 +1710,7 @@ next_ci:
@@ -1705,6 +1708,7 @@ next_ci:
ECM_IP_ADDR_TO_OCTAL(dest_addr_mask), dest_port_mask, proto_mask, cnt);
}
}
@ -208,7 +198,7 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
/*
* ecm_db_connection_defunct_by_port()
@@ -1994,6 +2000,7 @@ struct ecm_db_node_instance *ecm_db_conn
@@ -1994,6 +1998,7 @@ struct ecm_db_node_instance *ecm_db_conn
}
EXPORT_SYMBOL(ecm_db_connection_node_get_and_ref);
@ -216,7 +206,7 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
/*
* ecm_db_connection_mapping_get_and_ref_next()
* Return reference to next connection in the mapping chain in the specified direction.
@@ -2035,6 +2042,7 @@ struct ecm_db_connection_instance *ecm_d
@@ -2035,6 +2040,7 @@ struct ecm_db_connection_instance *ecm_d
return nci;
}
EXPORT_SYMBOL(ecm_db_connection_iface_get_and_ref_next);
@ -226,19 +216,7 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
* ecm_db_connection_mapping_get_and_ref()
--- a/ecm_db/ecm_db_node.c
+++ b/ecm_db/ecm_db_node.c
@@ -227,9 +227,11 @@ EXPORT_SYMBOL(ecm_db_node_get_and_ref_ne
*/
int ecm_db_node_deref(struct ecm_db_node_instance *ni)
{
+#ifdef ECM_DB_XREF_ENABLE
#if (DEBUG_LEVEL >= 1)
int dir;
#endif
+#endif
DEBUG_CHECK_MAGIC(ni, ECM_DB_NODE_INSTANCE_MAGIC, "%px: magic failed\n", ni);
spin_lock_bh(&ecm_db_lock);
@@ -489,9 +491,11 @@ EXPORT_SYMBOL(ecm_db_node_iface_get_and_
@@ -489,9 +489,11 @@ EXPORT_SYMBOL(ecm_db_node_iface_get_and_
void ecm_db_node_add(struct ecm_db_node_instance *ni, struct ecm_db_iface_instance *ii, uint8_t *address,
ecm_db_node_final_callback_t final, void *arg)
{

View File

@ -1,10 +0,0 @@
--- a/ecm_interface.c
+++ b/ecm_interface.c
@@ -47,6 +47,7 @@
#include <linux/rtnetlink.h>
#include <linux/socket.h>
#include <linux/wireless.h>
+#include <linux/nl80211.h>
#include <net/gre.h>
#ifdef ECM_INTERFACE_BOND_ENABLE
#include <net/bonding.h>

View File

@ -0,0 +1,14 @@
--- a/ecm_interface.c
+++ b/ecm_interface.c
@@ -4057,11 +4057,7 @@ static uint32_t ecm_interface_multicast_
* For MLO bond netdevice, destination for multicast is bond netdevice itself
* Therefore, slave lookup is not needed.
*/
-#ifdef ECM_FRONT_END_SFE_ENABLE
- if (ecm_front_end_is_lag_master(dest_dev) && !bond_is_mlo_device(dest_dev)) {
-#else
if (ecm_front_end_is_lag_master(dest_dev)) {
-#endif
/*
* Link aggregation
* Figure out which slave device of the link aggregation will be used to reach the destination.