mirror of
https://github.com/qosmio/nss-packages.git
synced 2025-12-17 16:51:41 +00:00
156 lines
4.1 KiB
Diff
156 lines
4.1 KiB
Diff
--- a/ecm_interface.c
|
|
+++ b/ecm_interface.c
|
|
@@ -8303,24 +8303,6 @@ static struct ctl_table ecm_interface_ta
|
|
{ }
|
|
};
|
|
|
|
-static struct ctl_table ecm_interface_root_dir[] = {
|
|
- {
|
|
- .procname = "ecm",
|
|
- .mode = 0555,
|
|
- .child = ecm_interface_table,
|
|
- },
|
|
- { }
|
|
-};
|
|
-
|
|
-static struct ctl_table ecm_interface_root[] = {
|
|
- {
|
|
- .procname = "net",
|
|
- .mode = 0555,
|
|
- .child = ecm_interface_root_dir,
|
|
- },
|
|
- { }
|
|
-};
|
|
-
|
|
#ifdef ECM_INTERFACE_IPSEC_GLUE_LAYER_SUPPORT_ENABLE
|
|
/*
|
|
* ecm_interface_ipsec_register_callbacks()
|
|
@@ -8817,7 +8799,7 @@ int ecm_interface_init(void)
|
|
/*
|
|
* Register sysctl table.
|
|
*/
|
|
- ecm_interface_ctl_table_header = register_sysctl_table(ecm_interface_root);
|
|
+ ecm_interface_ctl_table_header = register_sysctl("net/ecm", ecm_interface_table);
|
|
|
|
result = register_netdevice_notifier(&ecm_interface_netdev_notifier);
|
|
if (result != 0) {
|
|
--- a/frontends/ecm_front_end_common.c
|
|
+++ b/frontends/ecm_front_end_common.c
|
|
@@ -1180,34 +1180,16 @@ static struct ctl_table ecm_front_end_sy
|
|
{}
|
|
};
|
|
|
|
-static struct ctl_table ecm_front_end_common_root[] = {
|
|
- {
|
|
- .procname = "ecm",
|
|
- .mode = 0555,
|
|
- .child = ecm_front_end_sysctl_tbl,
|
|
- },
|
|
- { }
|
|
-};
|
|
-
|
|
-static struct ctl_table ecm_front_end_common_root_dir[] = {
|
|
- {
|
|
- .procname = "net",
|
|
- .mode = 0555,
|
|
- .child = ecm_front_end_common_root,
|
|
- },
|
|
- { }
|
|
-};
|
|
-
|
|
/*
|
|
* ecm_front_end_common_sysctl_register()
|
|
* Function to register sysctl node during front end init
|
|
*/
|
|
-void ecm_front_end_common_sysctl_register()
|
|
+void ecm_front_end_common_sysctl_register(void)
|
|
{
|
|
/*
|
|
* Register sysctl table.
|
|
*/
|
|
- ecm_front_end_ctl_tbl_hdr = register_sysctl_table(ecm_front_end_common_root_dir);
|
|
+ ecm_front_end_ctl_tbl_hdr = register_sysctl("net/ecm", ecm_front_end_sysctl_tbl);
|
|
#ifdef ECM_FRONT_END_SFE_ENABLE
|
|
if (ecm_front_end_ctl_tbl_hdr) {
|
|
ecm_sfe_sysctl_tbl_init();
|
|
@@ -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
|
|
*/
|
|
-void ecm_front_end_common_sysctl_unregister()
|
|
+void ecm_front_end_common_sysctl_unregister(void)
|
|
{
|
|
/*
|
|
* Unregister sysctl table.
|
|
@@ -1718,7 +1700,11 @@ bool ecm_front_end_common_intf_ingress_q
|
|
{
|
|
#if defined(CONFIG_NET_CLS_ACT)
|
|
struct net_device *dev;
|
|
- struct mini_Qdisc *miniq;
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0)
|
|
+ struct mini_Qdisc *entry;
|
|
+#else
|
|
+ struct bpf_mprog_entry *entry;
|
|
+#endif
|
|
|
|
dev = dev_get_by_index(&init_net, interface_num);
|
|
if (!dev) {
|
|
@@ -1727,8 +1713,13 @@ bool ecm_front_end_common_intf_ingress_q
|
|
}
|
|
|
|
BUG_ON(!rcu_read_lock_bh_held());
|
|
- miniq = rcu_dereference_bh(dev->miniq_ingress);
|
|
- if (miniq) {
|
|
+
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0)
|
|
+ entry = rcu_dereference_bh(dev->miniq_ingress);
|
|
+#else
|
|
+ entry = rcu_dereference_bh(dev->tcx_ingress);
|
|
+#endif
|
|
+ if (entry) {
|
|
DEBUG_INFO("Ingress Qdisc is present for device[%s]\n", dev->name);
|
|
dev_put(dev);
|
|
return true;
|
|
@@ -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)
|
|
- struct mini_Qdisc *miniq;
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0)
|
|
+ struct mini_Qdisc *entry;
|
|
+#else
|
|
+ struct bpf_mprog_entry *entry;
|
|
+#endif
|
|
#endif
|
|
|
|
*is_ppeq = false;
|
|
@@ -1782,8 +1777,12 @@ bool ecm_front_end_common_intf_qdisc_che
|
|
}
|
|
|
|
#if defined(CONFIG_NET_CLS_ACT) && defined(CONFIG_NET_EGRESS)
|
|
- miniq = rcu_dereference_bh(dev->miniq_egress);
|
|
- if (miniq) {
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0)
|
|
+ entry = rcu_dereference_bh(dev->miniq_egress);
|
|
+#else
|
|
+ entry = rcu_dereference_bh(dev->tcx_egress);
|
|
+#endif
|
|
+ if (entry) {
|
|
DEBUG_INFO("Egress needed\n");
|
|
dev_put(dev);
|
|
return true;
|
|
--- a/frontends/nss/ecm_nss_common.h
|
|
+++ b/frontends/nss/ecm_nss_common.h
|
|
@@ -277,8 +277,10 @@ static inline bool ecm_nss_common_igs_ac
|
|
*/
|
|
#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0))
|
|
if (likely(!(to_dev->ingress_cl_list))) {
|
|
-#else
|
|
+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0))
|
|
if (likely(!(to_dev->miniq_ingress))) {
|
|
+#else
|
|
+ if (likely(!(to_dev->tcx_ingress))) {
|
|
#endif
|
|
dev_put(to_dev);
|
|
continue;
|