diff --git a/qca-nss-clients/patches-11.4/0030-fixup-compiler-errors.patch b/qca-nss-clients/patches-11.4/0030-fixup-compiler-errors.patch index 3d2194c..d861a74 100644 --- a/qca-nss-clients/patches-11.4/0030-fixup-compiler-errors.patch +++ b/qca-nss-clients/patches-11.4/0030-fixup-compiler-errors.patch @@ -251,6 +251,15 @@ --- a/pvxlanmgr/nss_pvxlanmgr.c +++ b/pvxlanmgr/nss_pvxlanmgr.c +@@ -180,7 +180,7 @@ static struct rtnl_link_stats64 *nss_pvx + atomic_long_set(&(dev)->stats.__rx_dropped, 0); + priv = netdev_priv(dev); + memset(stats, 0, sizeof(struct rtnl_link_stats64)); +- memcpy(stats, &priv->stats, sizeof(struct rtnl_link_stats64)); ++ *stats = priv->stats; + dev_put(dev); + + return stats; @@ -408,7 +408,7 @@ nss_pvxlanmgr_status_t nss_pvxlanmgr_net if (ret != NSS_TX_SUCCESS) { nss_pvxlanmgr_warn("%px: Tunnel disable failed: %d\n", dev, ret); @@ -406,7 +415,7 @@ v->eg_xlt_rule.vsi = vsi; /* Use vsi as search key*/ v->eg_xlt_rule.s_tagged = 0x7; /* Accept tagged/untagged/priority tagged svlan */ v->eg_xlt_rule.c_tagged = 0x7; /* Accept tagged/untagged/priority tagged cvlan */ -@@ -1817,8 +1817,8 @@ void nss_vlan_mgr_add_vlan_rule(struct n +@@ -1805,8 +1805,8 @@ void nss_vlan_mgr_add_vlan_rule(struct n /* * Fields for match */ @@ -417,7 +426,7 @@ eg_xlt_rule.vsi = bridge_vsi; /* Use vsi as search key */ eg_xlt_rule.s_tagged = 0x7; /* Accept tagged/untagged/priority tagged svlan */ eg_xlt_rule.c_tagged = 0x7; /* Accept tagged/untagged/priority tagged cvlan */ -@@ -1885,8 +1885,8 @@ void nss_vlan_mgr_del_vlan_rule(struct n +@@ -1873,8 +1873,8 @@ void nss_vlan_mgr_del_vlan_rule(struct n /* * Fields for match */ diff --git a/qca-nss-clients/patches/0030-fixup-compiler-errors.patch b/qca-nss-clients/patches/0030-fixup-compiler-errors.patch index d922597..37f99d2 100644 --- a/qca-nss-clients/patches/0030-fixup-compiler-errors.patch +++ b/qca-nss-clients/patches/0030-fixup-compiler-errors.patch @@ -73,6 +73,26 @@ } nss_qdisc_info("Enable SSDK level0 queue scheduler successful\n"); +@@ -589,15 +589,15 @@ static void nss_ppe_assigned_queue_enabl + spin_lock_bh(&ppe_port->lock); + res = ppe_port->res_used[NSS_PPE_UCAST_QUEUE]; + while (res) { +- fal_qm_enqueue_ctrl_set(0, qid + res->offset, true); +- fal_scheduler_dequeue_ctrl_set(0, qid + res->offset, true); ++ fal_qm_enqueue_ctrl_set(0, qid + res->offset, (a_bool_t)true); ++ fal_scheduler_dequeue_ctrl_set(0, qid + res->offset, (a_bool_t)true); + res = res->next; + } + + res = ppe_port->res_used[NSS_PPE_MCAST_QUEUE]; + while (res) { +- fal_qm_enqueue_ctrl_set(0, mcast_qid + res->offset, true); +- fal_scheduler_dequeue_ctrl_set(0, mcast_qid + res->offset, true); ++ fal_qm_enqueue_ctrl_set(0, mcast_qid + res->offset, (a_bool_t)true); ++ fal_scheduler_dequeue_ctrl_set(0, mcast_qid + res->offset, (a_bool_t)true); + res = res->next; + } + @@ -642,7 +642,7 @@ static int nss_ppe_l1_queue_scheduler_co l1cfg.e_pri = NSS_PPE_PRIORITY_MAX - npq->scheduler.priority; l1cfg.c_drr_id = npq->l1c_drrid; @@ -440,3 +460,27 @@ case NSS_WIFI_MESH_US_MESH_PATH_NOT_FOUND: ifnum = decap_ifnum; break; +@@ -1702,10 +1699,10 @@ nss_wifi_meshmgr_config_mesh_exception_s + ret = wait_for_completion_timeout(&wmesh_ctx->complete, msecs_to_jiffies(NSS_WIFI_MESH_TX_TIMEOUT)); + if (!ret) { + nss_wifi_meshmgr_warn("%px: WiFi mesh msg tx failed due to timeout\n", &wmgr_ctx); +- wmesh_ctx->response = NSS_WIFI_MESHMGR_FAILURE_SYNC_TIMEOUT; ++ wmesh_ctx->response = (nss_tx_status_t)NSS_WIFI_MESHMGR_FAILURE_SYNC_TIMEOUT; + } + +- nss_status = wmesh_ctx->response; ++ nss_status = (nss_wifi_meshmgr_status_t)wmesh_ctx->response; + up(&wmesh_ctx->sem); + + nss_wifi_meshmgr_ref_dec(wmesh_ctx); +--- a/netlink/nss_nlipsec.c ++++ b/netlink/nss_nlipsec.c +@@ -228,7 +228,7 @@ static void nss_nlipsec_process_event(vo + /* + * Initialize the NETLINK common header + */ +- nss_nlipsec_rule_init(nl_rule, ev->type); ++ nss_nlipsec_rule_init(nl_rule, (enum nss_nlipsec_cmd)ev->type); + + /* + * Copy the contents of the sync message into the NETLINK message