domenico/openwrt-R7800-nss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
e38c766dc7e12adc3a529667a05210c826b78fcb
openwrt-R7800-nss/package/qca-nss/qca-nss-clients/patches/120-kernel-6.6-support.patch
Lucas Asvio e38c766dc7 package: add qca-nss support for k6.x 
Before I can get to work a feed repository that work i have included
qca-nss source needed on this commit

Source author: SqTER-PL <r.napierala@asta-net.pl>
2025-08-04 18:52:30 +02:00

196 lines
6.1 KiB
Diff
Raw Blame History

--- a/gre/nss_connmgr_gre.c
+++ b/gre/nss_connmgr_gre.c
@@ -276,6 +276,8 @@ static struct rtnl_link_stats64 *nss_con
do {
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0))
start = u64_stats_fetch_begin_bh(&tstats->syncp);
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(6, 6, 0))
+ start = u64_stats_fetch_begin(&tstats->syncp);
#else
start = u64_stats_fetch_begin_irq(&tstats->syncp);
#endif
@@ -292,6 +294,8 @@ static struct rtnl_link_stats64 *nss_con
#endif
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0))
} while (u64_stats_fetch_retry_bh(&tstats->syncp, start));
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(6, 6, 0))
+ } while (u64_stats_fetch_retry(&tstats->syncp, start));
#else
} while (u64_stats_fetch_retry_irq(&tstats->syncp, start));
#endif
--- a/l2tp/l2tpv2/nss_connmgr_l2tpv2.c
+++ b/l2tp/l2tpv2/nss_connmgr_l2tpv2.c
@@ -954,7 +954,11 @@ int __init nss_connmgr_l2tpv2_init_modul
return 0;
}
#endif
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(6, 6, 0))
+ ctl_tbl_hdr = register_sysctl("dev/nss/l2tpv2", nss_connmgr_l2tpv2_table);
+#else
ctl_tbl_hdr = register_sysctl_table(nss_connmgr_l2tpv2_sysroot);
+#endif
if (!ctl_tbl_hdr) {
nss_connmgr_l2tpv2_info("Unable to register sysctl table for L2TP conn mgr\n");
return -EFAULT;
--- a/match/nss_match_cmd.c
+++ b/match/nss_match_cmd.c
@@ -20,6 +20,7 @@
* nss_match_cmd.c
*/
+#include <linux/version.h>
#include <linux/sysctl.h>
#include <linux/inetdevice.h>
#include <linux/netdevice.h>
@@ -692,6 +693,7 @@ static struct ctl_table nss_match_table[
{ }
};
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0))
static struct ctl_table nss_match_root_dir[] = {
{
.procname = "match",
@@ -718,6 +720,7 @@ static struct ctl_table nss_match_root[]
},
{ }
};
+#endif
static struct ctl_table_header *nss_match_ctl_header;
@@ -726,7 +729,11 @@ static struct ctl_table_header *nss_matc
* Register command line interface for match.
*/
bool nss_match_ctl_register(void) {
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(6, 6, 0))
+ nss_match_ctl_header = register_sysctl("dev/nss/match", nss_match_table);
+#else
nss_match_ctl_header = register_sysctl_table(nss_match_root);
+#endif
if (!nss_match_ctl_header) {
nss_match_warn("Unable to register command line interface.\n");
return false;
--- a/mirror/nss_mirror_ctl.c
+++ b/mirror/nss_mirror_ctl.c
@@ -16,6 +16,7 @@
***************************************************************************
*/
+#include <linux/version.h>
#include <linux/sysctl.h>
#include <linux/string.h>
@@ -918,6 +919,7 @@ static struct ctl_table nss_mirror_table
{ }
};
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0))
/*
* nss mirror dir
*/
@@ -953,6 +955,7 @@ static struct ctl_table nss_mirror_root[
},
{ }
};
+#endif
/*
* nss_mirror_ctl_register()
@@ -960,7 +963,11 @@ static struct ctl_table nss_mirror_root[
*/
int nss_mirror_ctl_register(void)
{
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(6, 6, 0))
+ nss_mirror_ctl_header = register_sysctl("dev/nss/mirror", nss_mirror_table);
+#else
nss_mirror_ctl_header = register_sysctl_table(nss_mirror_root);
+#endif
if (!nss_mirror_ctl_header) {
nss_mirror_warn("Creating sysctl directory table header for mirror failed\n");
return -1;
--- a/netlink/nss_nl.c
+++ b/netlink/nss_nl.c
@@ -328,7 +328,11 @@ struct nss_nlcmn *nss_nl_get_msg(struct
/*
* validate the common message header version & magic
*/
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0))
cm = info->userhdr;
+#else
+ cm = genl_info_userhdr(info);
+#endif
if (nss_nlcmn_chk_ver(cm, family->version) == false) {
nss_nl_error("%d, %s: version mismatch (%d)\n", pid, family->name, cm->version);
return NULL;
--- a/nss_qdisc/nss_wred.c
+++ b/nss_qdisc/nss_wred.c
@@ -296,7 +296,7 @@ static int nss_wred_change(struct Qdisc
nim.msg.shaper_configure.config.msg.shaper_node_config.qos_tag = q->nq.qos_tag;
nim.msg.shaper_configure.config.msg.shaper_node_config.snc.wred_param.limit = qopt->limit;
- nim.msg.shaper_configure.config.msg.shaper_node_config.snc.wred_param.weight_mode = qopt->weight_mode;
+ nim.msg.shaper_configure.config.msg.shaper_node_config.snc.wred_param.weight_mode = (nss_shaper_config_wred_weight_mode_t)qopt->weight_mode;
nim.msg.shaper_configure.config.msg.shaper_node_config.snc.wred_param.weight_mode_value = qopt->weight_mode_value;
nim.msg.shaper_configure.config.msg.shaper_node_config.snc.wred_param.rap.min = qopt->rap.min;
nim.msg.shaper_configure.config.msg.shaper_node_config.snc.wred_param.rap.max = qopt->rap.max;
--- a/tunipip6/nss_connmgr_tunipip6_sysctl.c
+++ b/tunipip6/nss_connmgr_tunipip6_sysctl.c
@@ -449,6 +449,7 @@ static struct ctl_table nss_tunipip6_tab
{ }
};
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0))
static struct ctl_table nss_tunipip6_root_dir[] = {
{
.procname = "ipip6",
@@ -475,6 +476,7 @@ static struct ctl_table nss_tunipip6_roo
},
{ }
};
+#endif
static struct ctl_table_header *nss_tunipip6_ctl_header;
@@ -483,7 +485,11 @@ static struct ctl_table_header *nss_tuni
* Register command line interface for tunipip6.
*/
bool nss_tunipip6_sysctl_register(void) {
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(6, 6, 0))
+ nss_tunipip6_ctl_header = register_sysctl("drv/nss/ipip6", nss_tunipip6_table);
+#else
nss_tunipip6_ctl_header = register_sysctl_table(nss_tunipip6_root);
+#endif
if (!nss_tunipip6_ctl_header) {
return false;
}
--- a/vlan/nss_vlan_mgr.c
+++ b/vlan/nss_vlan_mgr.c
@@ -1557,6 +1557,7 @@ static struct ctl_table nss_vlan_table[]
{ }
};
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0))
/*
* nss_vlan sysctl dir
*/
@@ -1580,6 +1581,7 @@ static struct ctl_table nss_vlan_root_di
},
{ }
};
+#endif
/*
* nss_vlan_mgr_add_bond_slave()
@@ -1920,7 +1922,11 @@ int __init nss_vlan_mgr_init_module(void
vlan_mgr_ctx.stpid = ETH_P_8021Q;
#ifdef NSS_VLAN_MGR_PPE_SUPPORT
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(6, 6, 0))
+ vlan_mgr_ctx.sys_hdr = register_sysctl("nss/vlan_client", nss_vlan_table);
+#else
vlan_mgr_ctx.sys_hdr = register_sysctl_table(nss_vlan_root_dir);
+#endif
if (!vlan_mgr_ctx.sys_hdr) {
nss_vlan_mgr_warn("Unabled to register sysctl table for vlan manager\n");
return -EFAULT;
Reference in New Issue View Git Blame Copy Permalink