merged. Bruce
In message: [linux-yocto][linux-yocto v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc][PATCH] dpaa2-eth: replace struct "gnet_stats_basic_packed" with "gnet_stats_basic_sync" on 21/10/2022 Xulin Sun wrote: > commit 304640d0b862(net: sched: Merge Qdisc::bstats and Qdisc::cpu_bstats > data types) > has dropped the struct "gnet_stats_basic_packed", replaced with > "gnet_stats_basic_sync". > Here adapt to this changes. > > And using the API u64_stats_add() to avoid below building error: > dpaa2-eth-ceetm.c:380:49: error: invalid operands to binary + (have > 'u64_stats_t' and 'u64_stats_t') > | 380 | sch->bstats.bytes += > qdisc->bstats.bytes; > | | ^~ > ~~~~~~~~~~~~~~~~~~~ > | | | > | | > u64_stats_t > > Signed-off-by: Xulin Sun <[email protected]> > --- > drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-ceetm.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-ceetm.c > b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-ceetm.c > index 13255617c9f2..e92aa1ec84c1 100644 > --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-ceetm.c > +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-ceetm.c > @@ -377,8 +377,8 @@ static int dpaa2_ceetm_dump(struct Qdisc *sch, struct > sk_buff *skb) > for (ntx = 0; ntx < dev->num_tx_queues; ntx++) { > qdisc = netdev_get_tx_queue(dev, ntx)->qdisc_sleeping; > sch->q.qlen += qdisc->q.qlen; > - sch->bstats.bytes += qdisc->bstats.bytes; > - sch->bstats.packets += qdisc->bstats.packets; > + u64_stats_add(&sch->bstats.bytes, > u64_stats_read(&qdisc->bstats.bytes)); > + u64_stats_add(&sch->bstats.packets, > u64_stats_read(&qdisc->bstats.packets)); > sch->qstats.qlen += qdisc->qstats.qlen; > sch->qstats.backlog += qdisc->qstats.backlog; > sch->qstats.drops += qdisc->qstats.drops; > @@ -1051,7 +1051,7 @@ static int dpaa2_ceetm_cls_dump_stats(struct Qdisc > *sch, unsigned long arg, > struct gnet_dump *d) > { > struct dpaa2_ceetm_class *cl = (struct dpaa2_ceetm_class *)arg; > - struct gnet_stats_basic_packed tmp_bstats; > + struct gnet_stats_basic_sync tmp_bstats; > struct dpaa2_ceetm_tc_xstats xstats; > union dpni_statistics dpni_stats; > struct net_device *dev = qdisc_dev(sch); > -- > 2.36.1 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#11804): https://lists.yoctoproject.org/g/linux-yocto/message/11804 Mute This Topic: https://lists.yoctoproject.org/mt/94470556/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
