qca-nss-clients: update to 12.4

qca/qca-nss-clients/Makefile

@@ -5,9 +5,9 @@ PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/nss-clients.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2023-01-20
+PKG_SOURCE_DATE:=2023-10-04
-PKG_SOURCE_VERSION:=a207a7ace19c55e473b7428108e7ad8982b67aa7
+PKG_SOURCE_VERSION:=f058ae199b42f30be9925b2ed1ce53afb128200c
-PKG_MIRROR_HASH:=a122da3f3764403d791a267c60b1082514dd3f243496ae0fbaec388726d5a841
+PKG_MIRROR_HASH:=90401b577a7750d3b7eadb423700aab7e1da1af392637598e08f6007f23a92e1
 
 PKG_BUILD_PARALLEL:=1
 

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

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

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

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

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

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

qca/qca-nss-clients/patches/0018-kernel-6.1-support.patch

@@ -1,6 +1,6 @@
 --- a/bridge/nss_bridge_mgr.c
 +++ b/bridge/nss_bridge_mgr.c
-@@ -1075,7 +1075,7 @@ int nss_bridge_mgr_register_br(struct ne
+@@ -1081,7 +1081,7 @@ int nss_bridge_mgr_register_br(struct ne
  	}
  #endif
  
@@ -9,7 +9,7 @@
  	if (err != NSS_TX_SUCCESS) {
  		nss_bridge_mgr_warn("%px: failed to set mac_addr msg, error = %d\n", b_pvt, err);
  		goto fail_4;
-@@ -1236,7 +1236,7 @@ static int nss_bridge_mgr_changeaddr_eve
+@@ -1242,7 +1242,7 @@ static int nss_bridge_mgr_changeaddr_eve
  
  	nss_bridge_mgr_trace("%px: MAC changed to %pM, update NSS\n", b_pvt, dev->dev_addr);
  
@@ -102,7 +102,6 @@
  
  	rcu_read_lock();
  	retval = READ_ONCE(act->tcf_action);
-
 --- a/nss_qdisc/nss_qdisc.h
 +++ b/nss_qdisc/nss_qdisc.h
 @@ -217,7 +217,7 @@ struct nss_qdisc {
@@ -123,7 +122,6 @@
  
  /*
   * nss_qdisc_gnet_stats_copy_queue()
-
 --- a/nss_qdisc/igs/nss_ifb.c
 +++ b/nss_qdisc/igs/nss_ifb.c
 @@ -544,8 +544,10 @@ static void nss_ifb_update_dev_stats(str
@@ -157,7 +155,6 @@
  #else
  	return gnet_stats_copy_basic(qdisc_root_sleeping_running(sch), d, NULL, b);
  #endif
-
 --- a/nss_qdisc/nss_qdisc_stats.c
 +++ b/nss_qdisc/nss_qdisc_stats.c
 @@ -160,7 +160,7 @@ static void nss_qdisc_stats_process_node
@@ -180,7 +177,6 @@
  
  	/*
  	 * Update qdisc->qstats
-
 --- a/vlan/nss_vlan_mgr.c
 +++ b/vlan/nss_vlan_mgr.c
 @@ -787,7 +787,7 @@ static struct nss_vlan_pvt *nss_vlan_mgr
@@ -209,7 +205,6 @@
  	spin_unlock(&vlan_mgr_ctx.lock);
  	nss_vlan_mgr_trace("%s: MAC changed to %pM, updated NSS\n", dev->name, dev->dev_addr);
  	nss_vlan_mgr_instance_deref(v_pvt);
-
 --- a/vxlanmgr/nss_vxlanmgr_tunnel.c
 +++ b/vxlanmgr/nss_vxlanmgr_tunnel.c
 @@ -489,8 +489,8 @@ static void nss_vxlanmgr_tunnel_inner_st
@@ -234,7 +229,6 @@
  	u64_stats_update_end(&tstats->syncp);
  	netdev_stats->rx_dropped += dropped;
  	dev_put(dev);
-
 --- a/pvxlanmgr/nss_pvxlanmgr.c
 +++ b/pvxlanmgr/nss_pvxlanmgr.c
 @@ -177,7 +177,7 @@ static struct rtnl_link_stats64 *nss_pvx
@@ -255,7 +249,6 @@
  	memset(dev->broadcast, 0xff, dev->addr_len);
  	memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
  }
-
 --- a/clmapmgr/nss_clmapmgr.c
 +++ b/clmapmgr/nss_clmapmgr.c
 @@ -103,7 +103,7 @@ static struct rtnl_link_stats64 *nss_clm
@@ -267,7 +260,6 @@
  	priv = netdev_priv(dev);
  	memset(stats, 0, sizeof(struct rtnl_link_stats64));
  	memcpy(stats, &priv->stats, sizeof(struct rtnl_link_stats64));
-
 --- a/tls/nss_tlsmgr_tun.c
 +++ b/tls/nss_tlsmgr_tun.c
 @@ -185,7 +185,7 @@ static void nss_tlsmgr_tun_setup(struct
@@ -279,7 +271,6 @@
  
  	memset(dev->broadcast, 0xff, dev->addr_len);
  	memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
-
 --- a/netlink/nss_nlgre_redir_cmn.c
 +++ b/netlink/nss_nlgre_redir_cmn.c
 @@ -384,7 +384,7 @@ static int nss_nlgre_redir_cmn_set_mac_a