rtnl_link_stats64 wants aFrameTooLongErrors in rx_length_errors, and the eth-mac stats already report the oversize counter there as FrameTooLongErrors; move it from rx_over_errors, which is a RX FIFO overflow counter. Drop the tx_undersize to tx_fifo_errors mapping as well; a runt frame is not a FIFO underrun. Report it as a TxUndersize ethtool stat instead. Signed-off-by: David Yang --- drivers/net/dsa/motorcomm/mib.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/dsa/motorcomm/mib.c b/drivers/net/dsa/motorcomm/mib.c index 6b170fc6e187..5c027edb71e3 100644 --- a/drivers/net/dsa/motorcomm/mib.c +++ b/drivers/net/dsa/motorcomm/mib.c @@ -50,7 +50,7 @@ static const struct yt921x_mib_desc yt921x_mib_descs[] = { MIB_DESC(1, YT921X_MIB_DATA_TX_PAUSE, NULL), MIB_DESC(1, YT921X_MIB_DATA_TX_MULTICAST, NULL), - MIB_DESC(1, YT921X_MIB_DATA_TX_UNDERSIZE_ERR, NULL), + MIB_DESC(1, YT921X_MIB_DATA_TX_UNDERSIZE_ERR, "TxUndersize"), MIB_DESC(1, YT921X_MIB_DATA_TX_PKT_SZ_64, NULL), MIB_DESC(1, YT921X_MIB_DATA_TX_PKT_SZ_65_TO_127, NULL), MIB_DESC(1, YT921X_MIB_DATA_TX_PKT_SZ_128_TO_255, NULL), @@ -376,8 +376,9 @@ yt921x_dsa_get_stats64(struct dsa_switch *ds, int port, start = u64_stats_fetch_begin(&pm->syncp); stats->rx_length_errors = u64_stats_read(&mib->rx_undersize_errors) + - u64_stats_read(&mib->rx_fragment_errors); - stats->rx_over_errors = u64_stats_read(&mib->rx_oversize_errors); + u64_stats_read(&mib->rx_fragment_errors) + + u64_stats_read(&mib->rx_oversize_errors); + /* stats->rx_over_errors */ stats->rx_crc_errors = u64_stats_read(&mib->rx_crc_errors); stats->rx_frame_errors = u64_stats_read(&mib->rx_alignment_errors); /* stats->rx_fifo_errors */ @@ -385,7 +386,7 @@ yt921x_dsa_get_stats64(struct dsa_switch *ds, int port, stats->tx_aborted_errors = u64_stats_read(&mib->tx_aborted_errors); /* stats->tx_carrier_errors */ - stats->tx_fifo_errors = u64_stats_read(&mib->tx_undersize_errors); + /* stats->tx_fifo_errors */ /* stats->tx_heartbeat_errors */ stats->tx_window_errors = u64_stats_read(&mib->tx_late_collisions); @@ -401,10 +402,9 @@ yt921x_dsa_get_stats64(struct dsa_switch *ds, int port, stats->collisions = u64_stats_read(&mib->tx_collisions); } while (u64_stats_fetch_retry(&pm->syncp, start)); - stats->rx_errors = stats->rx_length_errors + stats->rx_over_errors + - stats->rx_crc_errors + stats->rx_frame_errors; - stats->tx_errors = stats->tx_aborted_errors + stats->tx_fifo_errors + - stats->tx_window_errors; + stats->rx_errors = stats->rx_length_errors + stats->rx_crc_errors + + stats->rx_frame_errors; + stats->tx_errors = stats->tx_aborted_errors + stats->tx_window_errors; } void -- 2.53.0