mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
atl1c: 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>
This commit is contained in:
parent
88bfe6ea00
commit
8560258f0e
1 changed files with 20 additions and 11 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue