qca-nss-ecm: refresh patches

This commit is contained in:
Qosmio 2024-03-24 21:59:08 -04:00
parent 7c69a23a5f
commit 7e0e5abd8c
4 changed files with 13 additions and 13 deletions

View File

@ -39,7 +39,7 @@ instead or relying on a downstream api not present upstream.
spin_lock_bh(&ct->lock); spin_lock_bh(&ct->lock);
--- a/frontends/sfe/ecm_sfe_ipv4.c --- a/frontends/sfe/ecm_sfe_ipv4.c
+++ b/frontends/sfe/ecm_sfe_ipv4.c +++ b/frontends/sfe/ecm_sfe_ipv4.c
@@ -562,7 +562,8 @@ sync_conntrack: @@ -563,7 +563,8 @@ sync_conntrack:
#else #else
timeouts = nf_ct_timeout_lookup(ct); timeouts = nf_ct_timeout_lookup(ct);
if (!timeouts) { if (!timeouts) {

View File

@ -1,6 +1,6 @@
--- a/ecm_interface.c --- a/ecm_interface.c
+++ b/ecm_interface.c +++ b/ecm_interface.c
@@ -3603,7 +3603,7 @@ identifier_update: @@ -3616,7 +3616,7 @@ identifier_update:
if (skb && (skb->skb_iif == dev->ifindex)) { if (skb && (skb->skb_iif == dev->ifindex)) {
struct pppol2tp_common_addr info; struct pppol2tp_common_addr info;
@ -9,7 +9,7 @@
DEBUG_TRACE("%px: Net device: %px is MULTILINK PPP - Unknown to the ECM\n", feci, dev); DEBUG_TRACE("%px: Net device: %px is MULTILINK PPP - Unknown to the ECM\n", feci, dev);
type_info.unknown.os_specific_ident = dev_interface_num; type_info.unknown.os_specific_ident = dev_interface_num;
@@ -3613,7 +3613,7 @@ identifier_update: @@ -3626,7 +3626,7 @@ identifier_update:
ii = ecm_interface_unknown_interface_establish(&type_info.unknown, dev_name, dev_interface_num, ae_interface_num, dev_mtu); ii = ecm_interface_unknown_interface_establish(&type_info.unknown, dev_name, dev_interface_num, ae_interface_num, dev_mtu);
return ii; return ii;
} }

View File

@ -1,6 +1,6 @@
--- a/ecm_classifier_mscs.c --- a/ecm_classifier_mscs.c
+++ b/ecm_classifier_mscs.c +++ b/ecm_classifier_mscs.c
@@ -426,7 +426,6 @@ static void ecm_classifier_mscs_process( @@ -428,7 +428,6 @@ static void ecm_classifier_mscs_process(
struct ecm_db_connection_instance *ci = NULL; struct ecm_db_connection_instance *ci = NULL;
struct ecm_front_end_connection_instance *feci; struct ecm_front_end_connection_instance *feci;
ecm_front_end_acceleration_mode_t accel_mode; ecm_front_end_acceleration_mode_t accel_mode;
@ -8,7 +8,7 @@
uint32_t became_relevant = 0; uint32_t became_relevant = 0;
ecm_classifier_mscs_process_callback_t cb = NULL; ecm_classifier_mscs_process_callback_t cb = NULL;
ecm_classifier_mscs_result_t result = 0; ecm_classifier_mscs_result_t result = 0;
@@ -437,10 +436,10 @@ static void ecm_classifier_mscs_process( @@ -439,10 +438,10 @@ static void ecm_classifier_mscs_process(
struct net_device *src_dev = NULL; struct net_device *src_dev = NULL;
struct net_device *dest_dev = NULL; struct net_device *dest_dev = NULL;
uint64_t slow_pkts; uint64_t slow_pkts;

View File

@ -1,6 +1,6 @@
--- a/ecm_interface.c --- a/ecm_interface.c
+++ b/ecm_interface.c +++ b/ecm_interface.c
@@ -8269,24 +8269,6 @@ static struct ctl_table ecm_interface_ta @@ -8303,24 +8303,6 @@ static struct ctl_table ecm_interface_ta
{ } { }
}; };
@ -25,7 +25,7 @@
#ifdef ECM_INTERFACE_IPSEC_GLUE_LAYER_SUPPORT_ENABLE #ifdef ECM_INTERFACE_IPSEC_GLUE_LAYER_SUPPORT_ENABLE
/* /*
* ecm_interface_ipsec_register_callbacks() * ecm_interface_ipsec_register_callbacks()
@@ -8783,7 +8765,7 @@ int ecm_interface_init(void) @@ -8817,7 +8799,7 @@ int ecm_interface_init(void)
/* /*
* Register sysctl table. * Register sysctl table.
*/ */
@ -36,7 +36,7 @@
if (result != 0) { if (result != 0) {
--- a/frontends/ecm_front_end_common.c --- a/frontends/ecm_front_end_common.c
+++ b/frontends/ecm_front_end_common.c +++ b/frontends/ecm_front_end_common.c
@@ -1164,34 +1164,16 @@ static struct ctl_table ecm_front_end_sy @@ -1180,34 +1180,16 @@ static struct ctl_table ecm_front_end_sy
{} {}
}; };
@ -73,7 +73,7 @@
#ifdef ECM_FRONT_END_SFE_ENABLE #ifdef ECM_FRONT_END_SFE_ENABLE
if (ecm_front_end_ctl_tbl_hdr) { if (ecm_front_end_ctl_tbl_hdr) {
ecm_sfe_sysctl_tbl_init(); ecm_sfe_sysctl_tbl_init();
@@ -1203,7 +1185,7 @@ void ecm_front_end_common_sysctl_registe @@ -1219,7 +1201,7 @@ void ecm_front_end_common_sysctl_registe
* ecm_front_end_common_sysctl_unregister() * ecm_front_end_common_sysctl_unregister()
* Function to unregister sysctl node during front end exit * Function to unregister sysctl node during front end exit
*/ */
@ -82,7 +82,7 @@
{ {
/* /*
* Unregister sysctl table. * Unregister sysctl table.
@@ -1702,7 +1684,11 @@ bool ecm_front_end_common_intf_ingress_q @@ -1718,7 +1700,11 @@ bool ecm_front_end_common_intf_ingress_q
{ {
#if defined(CONFIG_NET_CLS_ACT) #if defined(CONFIG_NET_CLS_ACT)
struct net_device *dev; struct net_device *dev;
@ -95,7 +95,7 @@
dev = dev_get_by_index(&init_net, interface_num); dev = dev_get_by_index(&init_net, interface_num);
if (!dev) { if (!dev) {
@@ -1711,8 +1697,13 @@ bool ecm_front_end_common_intf_ingress_q @@ -1727,8 +1713,13 @@ bool ecm_front_end_common_intf_ingress_q
} }
BUG_ON(!rcu_read_lock_bh_held()); BUG_ON(!rcu_read_lock_bh_held());
@ -111,7 +111,7 @@
DEBUG_INFO("Ingress Qdisc is present for device[%s]\n", dev->name); DEBUG_INFO("Ingress Qdisc is present for device[%s]\n", dev->name);
dev_put(dev); dev_put(dev);
return true; return true;
@@ -1735,7 +1726,11 @@ bool ecm_front_end_common_intf_qdisc_che @@ -1751,7 +1742,11 @@ bool ecm_front_end_common_intf_qdisc_che
struct Qdisc *q; struct Qdisc *q;
int i; int i;
#if defined(CONFIG_NET_CLS_ACT) && defined(CONFIG_NET_EGRESS) #if defined(CONFIG_NET_CLS_ACT) && defined(CONFIG_NET_EGRESS)
@ -124,7 +124,7 @@
#endif #endif
*is_ppeq = false; *is_ppeq = false;
@@ -1766,8 +1761,12 @@ bool ecm_front_end_common_intf_qdisc_che @@ -1782,8 +1777,12 @@ bool ecm_front_end_common_intf_qdisc_che
} }
#if defined(CONFIG_NET_CLS_ACT) && defined(CONFIG_NET_EGRESS) #if defined(CONFIG_NET_CLS_ACT) && defined(CONFIG_NET_EGRESS)