In message: [linux-yocto] octeontx2-pf: Rename tot_tx_queues to non_qos_queues on 04/12/2023 Kevin Hao wrote:
> From: Kevin Hao <[email protected]> > > The otx2_hw::tot_tx_queues has been renamed to otx2_hw::non_qos_queues > by stable commit 479d344a929b ("octeontx2-pf: Rename tot_tx_queues to > non_qos_queues"), so we need adjust our codes according to this change. > > Signed-off-by: Kevin Hao <[email protected]> > --- > Hi Bruce, > > Could you help me merge this into the following two branches? > v6.1/standard/cn-sdkv5.15/octeon > v6.1/standard/preempt-rt/cn-sdkv5.15/octeon merged. Bruce > > drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c > b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c > index f362dded0f53..3424a8ae4f26 100644 > --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c > +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c > @@ -95,7 +95,7 @@ static void otx2_get_drvinfo(struct net_device *netdev, > > static int otx2_get_total_txq_count(struct otx2_nic *pfvf) > { > - return pfvf->hw.tot_tx_queues + pfvf->hw.tc_tx_queues; > + return pfvf->hw.non_qos_queues + pfvf->hw.tc_tx_queues; > } > > static void otx2_get_qset_strings(struct otx2_nic *pfvf, u8 **data, int qset) > @@ -112,9 +112,9 @@ static void otx2_get_qset_strings(struct otx2_nic *pfvf, > u8 **data, int qset) > } > for (qidx = 0; qidx < otx2_get_total_txq_count(pfvf); qidx++) { > for (stats = 0; stats < otx2_n_queue_stats; stats++) { > - if (qidx >= pfvf->hw.tot_tx_queues) > + if (qidx >= pfvf->hw.non_qos_queues) > sprintf(*data, "txq_qos%d: %s", > - qidx + start_qidx - > pfvf->hw.tot_tx_queues, > + qidx + start_qidx - > pfvf->hw.non_qos_queues, > otx2_queue_stats[stats].name); > else > sprintf(*data, "txq%d: %s", qidx + start_qidx, > @@ -286,7 +286,7 @@ static int otx2_get_sset_count(struct net_device *netdev, > int sset) > return -EINVAL; > > qstats_count = otx2_n_queue_stats * > - (pfvf->hw.rx_queues + pfvf->hw.tot_tx_queues + > + (pfvf->hw.rx_queues + pfvf->hw.non_qos_queues + > pfvf->hw.tc_tx_queues); > if (!test_bit(CN10K_RPM, &pfvf->hw.cap_flag)) > mac_stats = CGX_RX_STATS_COUNT + CGX_TX_STATS_COUNT; > -- > 2.39.2 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13367): https://lists.yoctoproject.org/g/linux-yocto/message/13367 Mute This Topic: https://lists.yoctoproject.org/mt/102967240/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/leave/6687884/21656/624485779/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
