diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-08-20 03:08:23 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-21 23:09:36 -0700 |
| commit | c3227e546c574172e77616270a16a04eae561b8f (patch) | |
| tree | 4272099dd078a4b92b376ec788156f329ea11a0d /drivers | |
| parent | a2c483a19a96cf5cb9465f42cca34548b9211954 (diff) | |
| download | linux-3.10-c3227e546c574172e77616270a16a04eae561b8f.tar.gz linux-3.10-c3227e546c574172e77616270a16a04eae561b8f.tar.bz2 linux-3.10-c3227e546c574172e77616270a16a04eae561b8f.zip | |
amd8111e: use net_device_stats from struct net_device
struct net_device has its own struct net_device_stats member, so use
this one instead of a private copy in the amd8111e_priv struct.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/amd8111e.c | 14 | ||||
| -rw-r--r-- | drivers/net/amd8111e.h | 1 |
2 files changed, 7 insertions, 8 deletions
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c index 1f5fc64b322..58a0ab4923e 100644 --- a/drivers/net/amd8111e.c +++ b/drivers/net/amd8111e.c @@ -903,18 +903,18 @@ static int amd8111e_read_mib(void __iomem *mmio, u8 MIB_COUNTER) } /* -This function reads the mib registers and returns the hardware statistics. It updates previous internal driver statistics with new values. -*/ -static struct net_device_stats *amd8111e_get_stats(struct net_device * dev) + * This function reads the mib registers and returns the hardware statistics. + * It updates previous internal driver statistics with new values. + */ +static struct net_device_stats *amd8111e_get_stats(struct net_device *dev) { struct amd8111e_priv *lp = netdev_priv(dev); void __iomem *mmio = lp->mmio; unsigned long flags; - /* struct net_device_stats *prev_stats = &lp->prev_stats; */ - struct net_device_stats* new_stats = &lp->stats; + struct net_device_stats *new_stats = &dev->stats; - if(!lp->opened) - return &lp->stats; + if (!lp->opened) + return new_stats; spin_lock_irqsave (&lp->lock, flags); /* stats.rx_packets */ diff --git a/drivers/net/amd8111e.h b/drivers/net/amd8111e.h index ac36eb6981e..b5926af03a7 100644 --- a/drivers/net/amd8111e.h +++ b/drivers/net/amd8111e.h @@ -787,7 +787,6 @@ struct amd8111e_priv{ struct vlan_group *vlgrp; #endif char opened; - struct net_device_stats stats; unsigned int drv_rx_errors; struct amd8111e_coalesce_conf coal_conf; |