diff options
| author | Stephen Hemminger | 2008-11-20 06:40:23 +0100 |
|---|---|---|
| committer | David S. Miller | 2008-11-20 06:40:23 +0100 |
| commit | eeda3fd64f75bcbfaa70ce946513abaf3f23b8e0 (patch) | |
| tree | 082d1921a5783ef5b07b4cf666804d6509f25f1a /drivers/net/bonding/bond_main.c | |
| parent | netdev: network device operations infrastructure (diff) | |
| download | kernel-qcow2-linux-eeda3fd64f75bcbfaa70ce946513abaf3f23b8e0.tar.gz kernel-qcow2-linux-eeda3fd64f75bcbfaa70ce946513abaf3f23b8e0.tar.xz kernel-qcow2-linux-eeda3fd64f75bcbfaa70ce946513abaf3f23b8e0.zip | |
netdev: introduce dev_get_stats()
In order for the network device ops get_stats call to be immutable, the handling
of the default internal network device stats block has to be changed. Add a new
helper function which replaces the old use of internal_get_stats.
Note: change return code to make it clear that the caller should not
go changing the returned statistics.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index a08ea4808056..db5f5c24a250 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -3899,7 +3899,7 @@ static int bond_close(struct net_device *bond_dev) static struct net_device_stats *bond_get_stats(struct net_device *bond_dev) { struct bonding *bond = netdev_priv(bond_dev); - struct net_device_stats *stats = &(bond->stats), *sstats; + struct net_device_stats *stats = &bond->stats; struct net_device_stats local_stats; struct slave *slave; int i; @@ -3909,7 +3909,8 @@ static struct net_device_stats *bond_get_stats(struct net_device *bond_dev) read_lock_bh(&bond->lock); bond_for_each_slave(bond, slave, i) { - sstats = slave->dev->get_stats(slave->dev); + const struct net_device_stats *sstats = dev_get_stats(slave->dev); + local_stats.rx_packets += sstats->rx_packets; local_stats.rx_bytes += sstats->rx_bytes; local_stats.rx_errors += sstats->rx_errors; |