him411/nss-packages-qosmio
1
0
Fork 0
mirror of https://github.com/qosmio/nss-packages.git synced 2025-12-18 09:11:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

qca-nss-clients: update to QSDK 12.3r2

Browse Source 
Bump QCA NSS clients to NHSS.QSDK.12.3.r2 tag.

Massive thanks to @AgustinLorenzo.

Reference:
ce4033f1fb
This commit is contained in:
bitthief 2023-05-08 15:06:16 +03:00
parent 639e24f6c7
commit cd3706b916
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qca/qca-nss-clients/Makefile
View File

@ -5,9 +5,9 @@ PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/nss-clients.git PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/nss-clients.git
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2022-03-18 PKG_SOURCE_DATE:=2023-01-20
PKG_SOURCE_VERSION:=a93764b647be71342e588f5e6406fde44f5b9ca4 PKG_SOURCE_VERSION:=a207a7ace19c55e473b7428108e7ad8982b67aa7
PKG_MIRROR_HASH:=f855957345c06f1760a059328e58b78bf1f9559e60aebf44784e0289d11743c2 PKG_MIRROR_HASH:=a122da3f3764403d791a267c60b1082514dd3f243496ae0fbaec388726d5a841
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1

22
qca/qca-nss-clients/patches/0001-kernel-5.15-support-qdisc.patch
View File

@ -1,6 +1,6 @@
--- a/nss_qdisc/igs/nss_mirred.c --- a/nss_qdisc/igs/nss_mirred.c
+++ b/nss_qdisc/igs/nss_mirred.c +++ b/nss_qdisc/igs/nss_mirred.c
@@ -82,20 +82,24 @@ static const struct nla_policy nss_mirre @@ -82,20 +82,24 @@ static const struct nla_policy nss_mirred_policy[TC_NSS_MIRRED_MAX + 1] = {
* nss_mirred_init() * nss_mirred_init()
* Initialize the nss mirred action. * Initialize the nss mirred action.
*/ */
@ -33,7 +33,7 @@
struct nlattr *arr[TC_NSS_MIRRED_MAX + 1]; struct nlattr *arr[TC_NSS_MIRRED_MAX + 1];
struct tc_nss_mirred *parm; struct tc_nss_mirred *parm;
struct nss_mirred_tcf *act; struct nss_mirred_tcf *act;
@@ -239,8 +243,13 @@ static int nss_mirred_init(struct net *n @@ -239,8 +243,13 @@ static int nss_mirred_init(struct net *net, struct nlattr *nla,
} }
if (!ret) { if (!ret) {
@ -49,7 +49,7 @@
return ret; return ret;
--- a/nss_qdisc/nss_bf.c --- a/nss_qdisc/nss_bf.c
+++ b/nss_qdisc/nss_bf.c +++ b/nss_qdisc/nss_bf.c
@@ -70,7 +70,7 @@ static inline struct nss_bf_class_data * @@ -74,7 +74,7 @@ static inline struct nss_bf_class_data *nss_bf_find_class(u32 classid,
*/ */
#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0))
static int nss_bf_change_class(struct Qdisc *sch, u32 classid, u32 parentid, static int nss_bf_change_class(struct Qdisc *sch, u32 classid, u32 parentid,
@ -58,7 +58,7 @@
{ {
struct netlink_ext_ack *extack = NULL; struct netlink_ext_ack *extack = NULL;
#else #else
@@ -296,7 +296,11 @@ static void nss_bf_destroy_class(struct @@ -290,7 +290,11 @@ static void nss_bf_destroy_class(struct Qdisc *sch, struct nss_bf_class_data *cl
* nss_bf_delete_class() * nss_bf_delete_class()
* Detaches a class from operation, but does not destroy it. * Detaches a class from operation, but does not destroy it.
*/ */
@ -72,7 +72,7 @@
struct nss_bf_class_data *cl = (struct nss_bf_class_data *)arg; struct nss_bf_class_data *cl = (struct nss_bf_class_data *)arg;
--- a/nss_qdisc/nss_htb.c --- a/nss_qdisc/nss_htb.c
+++ b/nss_qdisc/nss_htb.c +++ b/nss_qdisc/nss_htb.c
@@ -278,7 +278,7 @@ static int nss_htb_ppe_change_class(stru @@ -282,7 +282,7 @@ static int nss_htb_ppe_change_class(struct Qdisc *sch, struct nss_htb_class_data
*/ */
#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0))
static int nss_htb_change_class(struct Qdisc *sch, u32 classid, u32 parentid, static int nss_htb_change_class(struct Qdisc *sch, u32 classid, u32 parentid,
@ -81,7 +81,7 @@
{ {
struct netlink_ext_ack *extack = NULL; struct netlink_ext_ack *extack = NULL;
#else #else
@@ -522,7 +522,11 @@ static void nss_htb_destroy_class(struct @@ -516,7 +516,11 @@ static void nss_htb_destroy_class(struct Qdisc *sch, struct nss_htb_class_data *
* nss_htb_delete_class() * nss_htb_delete_class()
* Detaches a class from operation, but does not destroy it. * Detaches a class from operation, but does not destroy it.
*/ */
@ -95,7 +95,7 @@
struct nss_htb_class_data *cl = (struct nss_htb_class_data *)arg; struct nss_htb_class_data *cl = (struct nss_htb_class_data *)arg;
--- a/nss_qdisc/nss_qdisc.c --- a/nss_qdisc/nss_qdisc.c
+++ b/nss_qdisc/nss_qdisc.c +++ b/nss_qdisc/nss_qdisc.c
@@ -1144,15 +1144,16 @@ unsigned int nss_qdisc_drop(struct Qdisc @@ -1140,15 +1140,16 @@ unsigned int nss_qdisc_drop(struct Qdisc *sch)
{ {
struct nss_qdisc *nq = qdisc_priv(sch); struct nss_qdisc *nq = qdisc_priv(sch);
unsigned int ret; unsigned int ret;
@ -114,7 +114,7 @@
spin_unlock_bh(&nq->bounce_protection_lock); spin_unlock_bh(&nq->bounce_protection_lock);
} }
@@ -1206,10 +1207,10 @@ static bool nss_qdisc_iterate_fl(struct @@ -1209,10 +1210,10 @@ static bool nss_qdisc_iterate_fl(struct sk_buff *skb, struct Qdisc *sch)
return 0; return 0;
} }
@ -128,7 +128,7 @@
#endif #endif
if ((status == TC_ACT_STOLEN) || (status == TC_ACT_QUEUED)) { if ((status == TC_ACT_STOLEN) || (status == TC_ACT_QUEUED)) {
return 1; return 1;
@@ -2172,6 +2173,8 @@ int __nss_qdisc_init(struct Qdisc *sch, @@ -2188,6 +2189,8 @@ int __nss_qdisc_init(struct Qdisc *sch, struct nss_qdisc *nq, nss_shaper_node_ty
* This is to prevent mixing NSS and PPE qdisc with linux qdisc. * This is to prevent mixing NSS and PPE qdisc with linux qdisc.
*/ */
if ((parent != TC_H_ROOT) && (root->ops->owner != THIS_MODULE)) { if ((parent != TC_H_ROOT) && (root->ops->owner != THIS_MODULE)) {
@ -139,7 +139,7 @@
} }
--- a/nss_qdisc/nss_wrr.c --- a/nss_qdisc/nss_wrr.c
+++ b/nss_qdisc/nss_wrr.c +++ b/nss_qdisc/nss_wrr.c
@@ -230,7 +230,7 @@ static int nss_wrr_ppe_change_class(stru @@ -229,7 +229,7 @@ static int nss_wrr_ppe_change_class(struct Qdisc *sch, struct nss_wrr_class_data
#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0))
static int nss_wrr_change_class(struct Qdisc *sch, u32 classid, u32 parentid, static int nss_wrr_change_class(struct Qdisc *sch, u32 classid, u32 parentid,
@ -148,7 +148,7 @@
{ {
struct netlink_ext_ack *extack = NULL; struct netlink_ext_ack *extack = NULL;
#else #else
@@ -406,7 +406,11 @@ failure: @@ -400,7 +400,11 @@ failure:
return -EINVAL; return -EINVAL;
} }

6
qca/qca-nss-clients/patches/0005-vlanmgr-fix-compile-error.patch
View File

@ -1,6 +1,6 @@
--- a/vlan/nss_vlan_mgr.c --- a/vlan/nss_vlan_mgr.c
+++ b/vlan/nss_vlan_mgr.c +++ b/vlan/nss_vlan_mgr.c
@@ -821,8 +821,10 @@ static struct nss_vlan_pvt *nss_vlan_mgr @@ -800,8 +800,10 @@ static struct nss_vlan_pvt *nss_vlan_mgr_create_instance(
*/ */
static void nss_vlan_mgr_instance_free(struct nss_vlan_pvt *v) static void nss_vlan_mgr_instance_free(struct nss_vlan_pvt *v)
{ {
@ -11,7 +11,7 @@
spin_lock(&vlan_mgr_ctx.lock); spin_lock(&vlan_mgr_ctx.lock);
BUG_ON(--v->refs); BUG_ON(--v->refs);
@@ -980,8 +982,11 @@ static int nss_vlan_mgr_register_event(s @@ -961,8 +963,11 @@ static int nss_vlan_mgr_register_event(struct netdev_notifier_info *info)
int ret; int ret;
#endif #endif
uint32_t vlan_tag; uint32_t vlan_tag;
@ -48,7 +48,7 @@
return 0; return 0;
--- a/vlan/Makefile --- a/vlan/Makefile
+++ b/vlan/Makefile +++ b/vlan/Makefile
@@ -8,7 +8,7 @@ ifeq ($(SoC),$(filter $(SoC),ipq807x ipq @@ -8,7 +8,7 @@ ifeq ($(SoC),$(filter $(SoC),ipq807x ipq807x_64 ipq60xx ipq60xx_64))
ccflags-y += -DNSS_VLAN_MGR_PPE_SUPPORT ccflags-y += -DNSS_VLAN_MGR_PPE_SUPPORT
endif endif

6
qca/qca-nss-clients/patches/0007-bridge-fix-compile-error.patch
View File

@ -1,6 +1,6 @@
--- a/bridge/nss_bridge_mgr.c --- a/bridge/nss_bridge_mgr.c
+++ b/bridge/nss_bridge_mgr.c +++ b/bridge/nss_bridge_mgr.c
@@ -1062,8 +1062,10 @@ int nss_bridge_mgr_register_br(struct ne @@ -1092,8 +1092,10 @@ int nss_bridge_mgr_register_br(struct net_device *dev)
*/ */
b_pvt->ifnum = ifnum; b_pvt->ifnum = ifnum;
b_pvt->mtu = dev->mtu; b_pvt->mtu = dev->mtu;
@ -11,7 +11,7 @@
ether_addr_copy(b_pvt->dev_addr, dev->dev_addr); ether_addr_copy(b_pvt->dev_addr, dev->dev_addr);
spin_lock(&br_mgr_ctx.lock); spin_lock(&br_mgr_ctx.lock);
list_add(&b_pvt->list, &br_mgr_ctx.list); list_add(&b_pvt->list, &br_mgr_ctx.list);
@@ -1125,6 +1127,7 @@ static int nss_bridge_mgr_bond_slave_cha @@ -1159,6 +1161,7 @@ static int nss_bridge_mgr_bond_slave_changeupper(struct netdev_notifier_changeup
return NOTIFY_DONE; return NOTIFY_DONE;
} }
@ -19,7 +19,7 @@
/* /*
* Add or remove the slave based based on linking event * Add or remove the slave based based on linking event
*/ */
@@ -1139,6 +1142,7 @@ static int nss_bridge_mgr_bond_slave_cha @@ -1173,6 +1176,7 @@ static int nss_bridge_mgr_bond_slave_changeupper(struct netdev_notifier_changeup
cu_info->upper_dev->name, master->name); cu_info->upper_dev->name, master->name);
} }
} }