Merge tag 'v3.3-rc7' into x86/mce

Merge reason: Update from an ancient -rc1 base to an almost-final stable kernel.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
index 9573303a706b..f98e1511660f 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
@@ -47,23 +47,25 @@ struct stmmac_stats {
         offsetof(struct stmmac_priv, xstats.m)}
 
 static const struct stmmac_stats stmmac_gstrings_stats[] = {
+        /* Transmit errors */
         STMMAC_STAT(tx_underflow),
         STMMAC_STAT(tx_carrier),
         STMMAC_STAT(tx_losscarrier),
         STMMAC_STAT(vlan_tag),
         STMMAC_STAT(tx_deferred),
         STMMAC_STAT(tx_vlan),
-        STMMAC_STAT(rx_vlan),
         STMMAC_STAT(tx_jabber),
         STMMAC_STAT(tx_frame_flushed),
         STMMAC_STAT(tx_payload_error),
         STMMAC_STAT(tx_ip_header_error),
+        /* Receive errors */
         STMMAC_STAT(rx_desc),
         STMMAC_STAT(sa_filter_fail),
         STMMAC_STAT(overflow_error),
         STMMAC_STAT(ipc_csum_error),
         STMMAC_STAT(rx_collision),
         STMMAC_STAT(rx_crc),
+        STMMAC_STAT(dribbling_bit),
         STMMAC_STAT(rx_length),
         STMMAC_STAT(rx_mii),
         STMMAC_STAT(rx_multicast),
@@ -73,6 +75,8 @@ static const struct stmmac_stats stmmac_gstrings_stats[] = {
         STMMAC_STAT(sa_rx_filter_fail),
         STMMAC_STAT(rx_missed_cntr),
         STMMAC_STAT(rx_overflow_cntr),
+        STMMAC_STAT(rx_vlan),
+        /* Tx/Rx IRQ errors */
         STMMAC_STAT(tx_undeflow_irq),
         STMMAC_STAT(tx_process_stopped_irq),
         STMMAC_STAT(tx_jabber_irq),
@@ -82,6 +86,7 @@ static const struct stmmac_stats stmmac_gstrings_stats[] = {
         STMMAC_STAT(rx_watchdog_irq),
         STMMAC_STAT(tx_early_irq),
         STMMAC_STAT(fatal_bus_error_irq),
+        /* Extra info */
         STMMAC_STAT(threshold),
         STMMAC_STAT(tx_pkt_n),
         STMMAC_STAT(rx_pkt_n),