From: David S. Miller Date: Wed, 15 Jan 2014 01:18:36 +0000 (-0800) Subject: Merge branch 'atl_stats' X-Git-Url: http://pileus.org/git/?p=~andy%2Flinux;a=commitdiff_plain;h=86c72fdf386d81e0b77a4c40b8ba8215fbb1418b 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 --- 86c72fdf386d81e0b77a4c40b8ba8215fbb1418b