Skip to content

Commit

Permalink
be2net: Get rid of net_device_stats from adapter.
Browse files Browse the repository at this point in the history
adapter doesnot need to maintain a copy of net_device_stats.
Use the one already available in net_device. This patch takes care of the same.

Signed-off-by: Ajit Khaparde <ajitk@serverengines.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Ajit Khaparde authored and David S. Miller committed Oct 7, 2009
1 parent 3295354 commit 78122a5
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
1 change: 0 additions & 1 deletion drivers/net/benet/be.h
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@ struct be_drvr_stats {

struct be_stats_obj {
struct be_drvr_stats drvr_stats;
struct net_device_stats net_stats;
struct be_dma_mem cmd;
};

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/benet/be_ethtool.c
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ be_get_ethtool_stats(struct net_device *netdev,
struct be_rxf_stats *rxf_stats = &hw_stats->rxf;
struct be_port_rxf_stats *port_stats =
&rxf_stats->port[adapter->port_num];
struct net_device_stats *net_stats = &adapter->stats.net_stats;
struct net_device_stats *net_stats = &netdev->stats;
struct be_erx_stats *erx_stats = &hw_stats->erx;
void *p = NULL;
int i;
Expand Down
6 changes: 2 additions & 4 deletions drivers/net/benet/be_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ void netdev_stats_update(struct be_adapter *adapter)
struct be_rxf_stats *rxf_stats = &hw_stats->rxf;
struct be_port_rxf_stats *port_stats =
&rxf_stats->port[adapter->port_num];
struct net_device_stats *dev_stats = &adapter->stats.net_stats;
struct net_device_stats *dev_stats = &adapter->netdev->stats;
struct be_erx_stats *erx_stats = &hw_stats->erx;

dev_stats->rx_packets = port_stats->rx_total_frames;
Expand Down Expand Up @@ -269,9 +269,7 @@ static void be_rx_eqd_update(struct be_adapter *adapter)

static struct net_device_stats *be_get_stats(struct net_device *dev)
{
struct be_adapter *adapter = netdev_priv(dev);

return &adapter->stats.net_stats;
return &dev->stats;
}

static u32 be_calc_rate(u64 bytes, unsigned long ticks)
Expand Down

0 comments on commit 78122a5

Please sign in to comment.