From 7e0e5abd8cf514e9bc3c91bb12ed30ea7df5ac25 Mon Sep 17 00:00:00 2001 From: Qosmio Date: Sun, 24 Mar 2024 21:59:08 -0400 Subject: [PATCH] qca-nss-ecm: refresh patches --- ...p-udp_get_timeouts-and-use-standard-ups.patch | 2 +- ...fix-ppp-generic-function-calls-for-5.15.patch | 4 ++-- .../patches/0011-ecm_classifier-move-defs.patch | 4 ++-- .../0015-ecm-add-support-for-kernel-6.6.patch | 16 ++++++++-------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qca-nss-ecm/patches/0009-frontends-drop-udp_get_timeouts-and-use-standard-ups.patch b/qca-nss-ecm/patches/0009-frontends-drop-udp_get_timeouts-and-use-standard-ups.patch index f88351e..a676419 100644 --- a/qca-nss-ecm/patches/0009-frontends-drop-udp_get_timeouts-and-use-standard-ups.patch +++ b/qca-nss-ecm/patches/0009-frontends-drop-udp_get_timeouts-and-use-standard-ups.patch @@ -39,7 +39,7 @@ instead or relying on a downstream api not present upstream. spin_lock_bh(&ct->lock); --- a/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 timeouts = nf_ct_timeout_lookup(ct); if (!timeouts) { diff --git a/qca-nss-ecm/patches/0010-ecm_interface-fix-ppp-generic-function-calls-for-5.15.patch b/qca-nss-ecm/patches/0010-ecm_interface-fix-ppp-generic-function-calls-for-5.15.patch index 93cbdc6..6933eb0 100644 --- a/qca-nss-ecm/patches/0010-ecm_interface-fix-ppp-generic-function-calls-for-5.15.patch +++ b/qca-nss-ecm/patches/0010-ecm_interface-fix-ppp-generic-function-calls-for-5.15.patch @@ -1,6 +1,6 @@ --- a/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)) { 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); 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); return ii; } diff --git a/qca-nss-ecm/patches/0011-ecm_classifier-move-defs.patch b/qca-nss-ecm/patches/0011-ecm_classifier-move-defs.patch index 2fd2efb..33720a1 100644 --- a/qca-nss-ecm/patches/0011-ecm_classifier-move-defs.patch +++ b/qca-nss-ecm/patches/0011-ecm_classifier-move-defs.patch @@ -1,6 +1,6 @@ --- a/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_front_end_connection_instance *feci; ecm_front_end_acceleration_mode_t accel_mode; @@ -8,7 +8,7 @@ uint32_t became_relevant = 0; ecm_classifier_mscs_process_callback_t cb = NULL; 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 *dest_dev = NULL; uint64_t slow_pkts; diff --git a/qca-nss-ecm/patches/0015-ecm-add-support-for-kernel-6.6.patch b/qca-nss-ecm/patches/0015-ecm-add-support-for-kernel-6.6.patch index dd85216..51e705b 100644 --- a/qca-nss-ecm/patches/0015-ecm-add-support-for-kernel-6.6.patch +++ b/qca-nss-ecm/patches/0015-ecm-add-support-for-kernel-6.6.patch @@ -1,6 +1,6 @@ --- a/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 /* * 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. */ @@ -36,7 +36,7 @@ if (result != 0) { --- a/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 if (ecm_front_end_ctl_tbl_hdr) { 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() * Function to unregister sysctl node during front end exit */ @@ -82,7 +82,7 @@ { /* * 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) struct net_device *dev; @@ -95,7 +95,7 @@ dev = dev_get_by_index(&init_net, interface_num); 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()); @@ -111,7 +111,7 @@ DEBUG_INFO("Ingress Qdisc is present for device[%s]\n", dev->name); dev_put(dev); 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; int i; #if defined(CONFIG_NET_CLS_ACT) && defined(CONFIG_NET_EGRESS) @@ -124,7 +124,7 @@ #endif *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)