Message ID | 1587681857-19734-1-git-send-email-opendmb@gmail.com |
---|---|
State | Accepted |
Delegated to: | David Miller |
Headers | show |
Series | [net] net: bcmgenet: correct per TX/RX ring statistics | expand |
On 4/23/2020 3:44 PM, Doug Berger wrote: > The change to track net_device_stats per ring to better support SMP > missed updating the rx_dropped member. > > The ndo_get_stats method is also needed to combine the results for > ethtool statistics (-S) before filling in the ethtool structure. > > Fixes: 37a30b435b92 ("net: bcmgenet: Track per TX/RX rings statistics") > Signed-off-by: Doug Berger <opendmb@gmail.com> Acked-by: Florian Fainelli <f.fainelli@gmail.com> Thanks for catching that!
From: Doug Berger <opendmb@gmail.com> Date: Thu, 23 Apr 2020 15:44:17 -0700 > The change to track net_device_stats per ring to better support SMP > missed updating the rx_dropped member. > > The ndo_get_stats method is also needed to combine the results for > ethtool statistics (-S) before filling in the ethtool structure. > > Fixes: 37a30b435b92 ("net: bcmgenet: Track per TX/RX rings statistics") > Signed-off-by: Doug Berger <opendmb@gmail.com> Applied and queued up for -stable, thanks.
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index d975338bf78d..c4765bbe527b 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -934,6 +934,8 @@ static void bcmgenet_get_ethtool_stats(struct net_device *dev, if (netif_running(dev)) bcmgenet_update_mib_counters(priv); + dev->netdev_ops->ndo_get_stats(dev); + for (i = 0; i < BCMGENET_STATS_LEN; i++) { const struct bcmgenet_stats *s; char *p; @@ -3156,6 +3158,7 @@ static struct net_device_stats *bcmgenet_get_stats(struct net_device *dev) dev->stats.rx_packets = rx_packets; dev->stats.rx_errors = rx_errors; dev->stats.rx_missed_errors = rx_errors; + dev->stats.rx_dropped = rx_dropped; return &dev->stats; }
The change to track net_device_stats per ring to better support SMP missed updating the rx_dropped member. The ndo_get_stats method is also needed to combine the results for ethtool statistics (-S) before filling in the ethtool structure. Fixes: 37a30b435b92 ("net: bcmgenet: Track per TX/RX rings statistics") Signed-off-by: Doug Berger <opendmb@gmail.com> --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 3 +++ 1 file changed, 3 insertions(+)