Skip to content

Commit

Permalink
atl1: use netdev->stats
Browse files Browse the repository at this point in the history
Get rid of private struct net_device_stats in "struct atl1e_adapter",
and use one provided in struct net_device instead.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Eric Dumazet authored and David S. Miller committed May 26, 2009
1 parent 08baf56 commit d3f65f7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion drivers/net/atl1e/atl1e.h
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,6 @@ struct atl1e_adapter {
struct mii_if_info mii; /* MII interface info */
struct atl1e_hw hw;
struct atl1e_hw_stats hw_stats;
struct net_device_stats net_stats;

bool have_msi;
u32 wol;
Expand Down
6 changes: 3 additions & 3 deletions drivers/net/atl1e/atl1e_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1153,7 +1153,7 @@ static struct net_device_stats *atl1e_get_stats(struct net_device *netdev)
{
struct atl1e_adapter *adapter = netdev_priv(netdev);
struct atl1e_hw_stats *hw_stats = &adapter->hw_stats;
struct net_device_stats *net_stats = &adapter->net_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;
Expand Down Expand Up @@ -1181,7 +1181,7 @@ static struct net_device_stats *atl1e_get_stats(struct net_device *netdev)
net_stats->tx_aborted_errors = hw_stats->tx_abort_col;
net_stats->tx_window_errors = hw_stats->tx_late_col;

return &adapter->net_stats;
return net_stats;
}

static void atl1e_update_hw_stats(struct atl1e_adapter *adapter)
Expand Down Expand Up @@ -1309,7 +1309,7 @@ static irqreturn_t atl1e_intr(int irq, void *data)

/* link event */
if (status & (ISR_GPHY | ISR_MANUAL)) {
adapter->net_stats.tx_carrier_errors++;
netdev->stats.tx_carrier_errors++;
atl1e_link_chg_event(adapter);
break;
}
Expand Down

0 comments on commit d3f65f7

Please sign in to comment.