Merge branch 'atl_stats'

Sabrina Dubroca says:

====================
atheros: modify statistics code

Following Ben Hutchings's advice on how to fill net_stats in alx [1],
this patch modifies the other atheros ethernet drivers
similarly. Minor whitespace/empty line changes in atl1c and atl1e to
make the code completely consistent between atl1c, atl1e, and alx.

I don't have this hardware, so these patches have only been
compile-tested.

v2 (changes only in atl1):
 - don't set soft_stats.rx_missed_errors (Ben)
 - add errors to soft_stats.{rx,tx}_packets (Ben)
 - add soft_stats.rx_dropped field and update soft_stats.rx_dropped
   instead of netdev->stats (overwritten) outside of the stats
   update function

Detail of the changes (v1):
* atl1/atl1c/atl1e
  - fix collisions computation
  - rx_dropped = rx_rrd_ov
  - rx_over_errors = 0
  - rx_missed_errors = 0
  - X_packets = X_ok + X_errors

* only atl1c/atl1e
  - add rx_rxf_ov to rx_errors

[1] http://www.spinics.net/lists/netdev/msg264930.html
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 65 insertions, 40 deletions

diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
index 29801750f239..4d3258dd0a88 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -1500,31 +1500,40 @@ static struct net_device_stats *atl1c_get_stats(struct net_device *netdev)
         struct net_device_stats *net_stats = &netdev->stats;
 
         atl1c_update_hw_stats(adapter);
-        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;
-        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->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_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;
 }
 
diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
index 7a73f3a9fcb5..d5c2d3e912e5 100644
--- 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;
 }
 
diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c
index 55d86ecdacfe..287272dd69da 100644
--- a/drivers/net/ethernet/atheros/atlx/atl1.c
+++ b/drivers/net/ethernet/atheros/atlx/atl1.c
@@ -1678,33 +1678,42 @@ static void atl1_inc_smb(struct atl1_adapter *adapter)
         struct net_device *netdev = adapter->netdev;
         struct stats_msg_block *smb = adapter->smb.smb;
 
+        u64 new_rx_errors = smb->rx_frag +
+                            smb->rx_fcs_err +
+                            smb->rx_len_err +
+                            smb->rx_sz_ov +
+                            smb->rx_rxf_ov +
+                            smb->rx_rrd_ov +
+                            smb->rx_align_err;
+        u64 new_tx_errors = smb->tx_late_col +
+                            smb->tx_abort_col +
+                            smb->tx_underrun +
+                            smb->tx_trunc;
+
         /* Fill out the OS statistics structure */
-        adapter->soft_stats.rx_packets += smb->rx_ok;
-        adapter->soft_stats.tx_packets += smb->tx_ok;
+        adapter->soft_stats.rx_packets += smb->rx_ok + new_rx_errors;
+        adapter->soft_stats.tx_packets += smb->tx_ok + new_tx_errors;
         adapter->soft_stats.rx_bytes += smb->rx_byte_cnt;
         adapter->soft_stats.tx_bytes += smb->tx_byte_cnt;
         adapter->soft_stats.multicast += smb->rx_mcast;
-        adapter->soft_stats.collisions += (smb->tx_1_col + smb->tx_2_col * 2 +
-                smb->tx_late_col + smb->tx_abort_col * adapter->hw.max_retry);
+        adapter->soft_stats.collisions += smb->tx_1_col +
+                                          smb->tx_2_col +
+                                          smb->tx_late_col +
+                                          smb->tx_abort_col;
 
         /* Rx Errors */
-        adapter->soft_stats.rx_errors += (smb->rx_frag + smb->rx_fcs_err +
-                smb->rx_len_err + smb->rx_sz_ov + smb->rx_rxf_ov +
-                smb->rx_rrd_ov + smb->rx_align_err);
+        adapter->soft_stats.rx_errors += new_rx_errors;
         adapter->soft_stats.rx_fifo_errors += smb->rx_rxf_ov;
         adapter->soft_stats.rx_length_errors += smb->rx_len_err;
         adapter->soft_stats.rx_crc_errors += smb->rx_fcs_err;
         adapter->soft_stats.rx_frame_errors += smb->rx_align_err;
-        adapter->soft_stats.rx_missed_errors += (smb->rx_rrd_ov +
-                smb->rx_rxf_ov);
 
         adapter->soft_stats.rx_pause += smb->rx_pause;
         adapter->soft_stats.rx_rrd_ov += smb->rx_rrd_ov;
         adapter->soft_stats.rx_trunc += smb->rx_sz_ov;
 
         /* Tx Errors */
-        adapter->soft_stats.tx_errors += (smb->tx_late_col +
-                smb->tx_abort_col + smb->tx_underrun + smb->tx_trunc);
+        adapter->soft_stats.tx_errors += new_tx_errors;
         adapter->soft_stats.tx_fifo_errors += smb->tx_underrun;
         adapter->soft_stats.tx_aborted_errors += smb->tx_abort_col;
         adapter->soft_stats.tx_window_errors += smb->tx_late_col;
@@ -1718,23 +1727,18 @@ static void atl1_inc_smb(struct atl1_adapter *adapter)
         adapter->soft_stats.tx_trunc += smb->tx_trunc;
         adapter->soft_stats.tx_pause += smb->tx_pause;
 
-        netdev->stats.rx_packets = adapter->soft_stats.rx_packets;
-        netdev->stats.tx_packets = adapter->soft_stats.tx_packets;
         netdev->stats.rx_bytes = adapter->soft_stats.rx_bytes;
         netdev->stats.tx_bytes = adapter->soft_stats.tx_bytes;
         netdev->stats.multicast = adapter->soft_stats.multicast;
         netdev->stats.collisions = adapter->soft_stats.collisions;
         netdev->stats.rx_errors = adapter->soft_stats.rx_errors;
-        netdev->stats.rx_over_errors =
-                adapter->soft_stats.rx_missed_errors;
         netdev->stats.rx_length_errors =
                 adapter->soft_stats.rx_length_errors;
         netdev->stats.rx_crc_errors = adapter->soft_stats.rx_crc_errors;
         netdev->stats.rx_frame_errors =
                 adapter->soft_stats.rx_frame_errors;
         netdev->stats.rx_fifo_errors = adapter->soft_stats.rx_fifo_errors;
-        netdev->stats.rx_missed_errors =
-                adapter->soft_stats.rx_missed_errors;
+        netdev->stats.rx_dropped = adapter->soft_stats.rx_rrd_ov;
         netdev->stats.tx_errors = adapter->soft_stats.tx_errors;
         netdev->stats.tx_fifo_errors = adapter->soft_stats.tx_fifo_errors;
         netdev->stats.tx_aborted_errors =
@@ -1743,6 +1747,9 @@ static void atl1_inc_smb(struct atl1_adapter *adapter)
                 adapter->soft_stats.tx_window_errors;
         netdev->stats.tx_carrier_errors =
                 adapter->soft_stats.tx_carrier_errors;
+
+        netdev->stats.rx_packets = adapter->soft_stats.rx_packets;
+        netdev->stats.tx_packets = adapter->soft_stats.tx_packets;
 }
 
 static void atl1_update_mailbox(struct atl1_adapter *adapter)
@@ -1872,7 +1879,7 @@ static u16 atl1_alloc_rx_buffers(struct atl1_adapter *adapter)
                                                 adapter->rx_buffer_len);
                 if (unlikely(!skb)) {
                         /* Better luck next round */
-                        adapter->netdev->stats.rx_dropped++;
+                        adapter->soft_stats.rx_dropped++;
                         break;
                 }
 
diff --git a/drivers/net/ethernet/atheros/atlx/atl1.h b/drivers/net/ethernet/atheros/atlx/atl1.h
index 3bf79a56220d..34a58cd846a0 100644
--- a/drivers/net/ethernet/atheros/atlx/atl1.h
+++ b/drivers/net/ethernet/atheros/atlx/atl1.h
@@ -666,6 +666,7 @@ struct atl1_sft_stats {
         u64 rx_errors;
         u64 rx_length_errors;
         u64 rx_crc_errors;
+        u64 rx_dropped;
         u64 rx_frame_errors;
         u64 rx_fifo_errors;
         u64 rx_missed_errors;