atl1e: update statistics code

As Ben Hutchings pointed out for the stats in alx, some
hardware-specific stats aren't matched to the right net_device_stats
field. Also fix the collision field and include errors in the total
number of RX/TX packets.

Minor whitespace fixes to match the style in alx.

Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Reviewed-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
index 7a73f3a9fcb5e2a5b0ffbac1ed1d0bc0163769cb..d5c2d3e912e57e1aae51b4bc265a95420f89822b 100644 (file)
--- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
+++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
@@ -1177,32 +1177,40 @@ static struct net_device_stats *atl1e_get_stats(struct net_device *netdev)
        struct atl1e_hw_stats  *hw_stats = &adapter->hw_stats;
        struct net_device_stats *net_stats = &netdev->stats;
 
-       net_stats->rx_packets = hw_stats->rx_ok;
-       net_stats->tx_packets = hw_stats->tx_ok;
        net_stats->rx_bytes   = hw_stats->rx_byte_cnt;
        net_stats->tx_bytes   = hw_stats->tx_byte_cnt;
        net_stats->multicast  = hw_stats->rx_mcast;
        net_stats->collisions = hw_stats->tx_1_col +
-                               hw_stats->tx_2_col * 2 +
-                               hw_stats->tx_late_col + hw_stats->tx_abort_col;
+                               hw_stats->tx_2_col +
+                               hw_stats->tx_late_col +
+                               hw_stats->tx_abort_col;
+
+       net_stats->rx_errors  = hw_stats->rx_frag +
+                               hw_stats->rx_fcs_err +
+                               hw_stats->rx_len_err +
+                               hw_stats->rx_sz_ov +
+                               hw_stats->rx_rrd_ov +
+                               hw_stats->rx_align_err +
+                               hw_stats->rx_rxf_ov;
 
-       net_stats->rx_errors  = hw_stats->rx_frag + hw_stats->rx_fcs_err +
-                               hw_stats->rx_len_err + hw_stats->rx_sz_ov +
-                               hw_stats->rx_rrd_ov + hw_stats->rx_align_err;
        net_stats->rx_fifo_errors   = hw_stats->rx_rxf_ov;
        net_stats->rx_length_errors = hw_stats->rx_len_err;
        net_stats->rx_crc_errors    = hw_stats->rx_fcs_err;
        net_stats->rx_frame_errors  = hw_stats->rx_align_err;
-       net_stats->rx_over_errors   = hw_stats->rx_rrd_ov + hw_stats->rx_rxf_ov;
+       net_stats->rx_dropped       = hw_stats->rx_rrd_ov;
 
-       net_stats->rx_missed_errors = hw_stats->rx_rrd_ov + hw_stats->rx_rxf_ov;
+       net_stats->tx_errors = hw_stats->tx_late_col +
+                              hw_stats->tx_abort_col +
+                              hw_stats->tx_underrun +
+                              hw_stats->tx_trunc;
 
-       net_stats->tx_errors = hw_stats->tx_late_col + hw_stats->tx_abort_col +
-                              hw_stats->tx_underrun + hw_stats->tx_trunc;
        net_stats->tx_fifo_errors    = hw_stats->tx_underrun;
        net_stats->tx_aborted_errors = hw_stats->tx_abort_col;
        net_stats->tx_window_errors  = hw_stats->tx_late_col;
 
+       net_stats->rx_packets = hw_stats->rx_ok + net_stats->rx_errors;
+       net_stats->tx_packets = hw_stats->tx_ok + net_stats->tx_errors;
+
        return net_stats;
 }