net: stmmac: rename rx_crc to rx_crc_errors

The ethtool stat counter rx_crc from stmmac is mis-named, the name
seems to speak about the number of RX CRC done, but in fact it is about
errors.

This patch rename it to rx_crc_errors, just like the same ifconfig
counter.

Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Acked-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h
index 24929bf17e84d5a96a84c77f9095aa7a7a535676..144fe84e8a531e63ae14c3f3a9c5348a7407285f 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/common.h
+++ b/drivers/net/ethernet/stmicro/stmmac/common.h
@@ -67,7 +67,7 @@ struct stmmac_extra_stats {
        unsigned long overflow_error;
        unsigned long ipc_csum_error;
        unsigned long rx_collision;
-       unsigned long rx_crc;
+       unsigned long rx_crc_errors;
        unsigned long dribbling_bit;
        unsigned long rx_length;
        unsigned long rx_mii;

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
index 8816515e1bbbc5c4a1fd5a443a478f2061d27c50..843ec69222eacd69f6107a0f6f1cceac83b2667f 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
@@ -103,7 +103,7 @@ static int dwmac4_wrback_get_rx_status(void *data, struct stmmac_extra_stats *x,
                        x->rx_mii++;
 
                if (unlikely(rdes3 & RDES3_CRC_ERROR)) {
-                       x->rx_crc++;
+                       x->rx_crc_errors++;
                        stats->rx_crc_errors++;
                }
 

diff --git a/drivers/net/ethernet/stmicro/stmmac/enh_desc.c b/drivers/net/ethernet/stmicro/stmmac/enh_desc.c
index 8427643e7211608fc95c279c1f49a935a4bbc07b..323b59ec74a35f4f318060f02d74c3b17af40d5d 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/enh_desc.c
+++ b/drivers/net/ethernet/stmicro/stmmac/enh_desc.c
@@ -221,7 +221,7 @@ static int enh_desc_get_rx_status(void *data, struct stmmac_extra_stats *x,
                        x->rx_mii++;
 
                if (unlikely(rdes0 & RDES0_CRC_ERROR)) {
-                       x->rx_crc++;
+                       x->rx_crc_errors++;
                        stats->rx_crc_errors++;
                }
                ret = discard_frame;

diff --git a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
index 5a0d4b038e357fa26351d07e67d5a425e1555b11..efb818ebd55e26c13b899c2180faf0ba0ed64609 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
+++ b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
@@ -111,7 +111,7 @@ static int ndesc_get_rx_status(void *data, struct stmmac_extra_stats *x,
                        stats->collisions++;
                }
                if (unlikely(rdes0 & RDES0_CRC_ERROR)) {
-                       x->rx_crc++;
+                       x->rx_crc_errors++;
                        stats->rx_crc_errors++;
                }
                ret = discard_frame;

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
index 9083d9a1cded162c357b94efc5c435b0b69241a3..aab895d9257ea1024edc070a1808bc48b682b78e 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
@@ -61,7 +61,7 @@ static const struct stmmac_stats stmmac_gstrings_stats[] = {
        STMMAC_STAT(overflow_error),
        STMMAC_STAT(ipc_csum_error),
        STMMAC_STAT(rx_collision),
-       STMMAC_STAT(rx_crc),
+       STMMAC_STAT(rx_crc_errors),
        STMMAC_STAT(dribbling_bit),
        STMMAC_STAT(rx_length),
        STMMAC_STAT(rx_mii),