diff options
| author | stephen hemminger <shemminger@vyatta.com> | 2011-06-08 14:54:03 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-08 23:26:33 -0700 |
| commit | c5f7ef72fcca7602ff8c75682b2a8568ba4e5064 (patch) | |
| tree | 6b21414d86925a45507a3f77b11c858220ed8655 | |
| parent | f20530bc982d67ebde84b3e0a043549d7ccd85a1 (diff) | |
| download | linux-3.10-c5f7ef72fcca7602ff8c75682b2a8568ba4e5064.tar.gz linux-3.10-c5f7ef72fcca7602ff8c75682b2a8568ba4e5064.tar.bz2 linux-3.10-c5f7ef72fcca7602ff8c75682b2a8568ba4e5064.zip | |
myricom: update to 64 bit stats
Driver was already keeping 64 bit counters, just not using the new interface.
Ps: IMHO drivers should not be duplicating network device
stats into ethtool stats. It is useless duplication.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/myri10ge/myri10ge.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index 3f33870de21..04e10f4d679 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/drivers/net/myri10ge/myri10ge.c @@ -377,7 +377,8 @@ static inline void put_be32(__be32 val, __be32 __iomem * p) __raw_writel((__force __u32) val, (__force void __iomem *)p); } -static struct net_device_stats *myri10ge_get_stats(struct net_device *dev); +static struct rtnl_link_stats64 *myri10ge_get_stats(struct net_device *dev, + struct rtnl_link_stats64 *stats); static void set_fw_name(struct myri10ge_priv *mgp, char *name, bool allocated) { @@ -1831,13 +1832,14 @@ myri10ge_get_ethtool_stats(struct net_device *netdev, { struct myri10ge_priv *mgp = netdev_priv(netdev); struct myri10ge_slice_state *ss; + struct rtnl_link_stats64 link_stats; int slice; int i; /* force stats update */ - (void)myri10ge_get_stats(netdev); + (void)myri10ge_get_stats(netdev, &link_stats); for (i = 0; i < MYRI10GE_NET_STATS_LEN; i++) - data[i] = ((unsigned long *)&netdev->stats)[i]; + data[i] = ((u64 *)&link_stats)[i]; data[i++] = (unsigned int)mgp->tx_boundary; data[i++] = (unsigned int)mgp->wc_enabled; @@ -2976,11 +2978,11 @@ drop: return NETDEV_TX_OK; } -static struct net_device_stats *myri10ge_get_stats(struct net_device *dev) +static struct rtnl_link_stats64 *myri10ge_get_stats(struct net_device *dev, + struct rtnl_link_stats64 *stats) { struct myri10ge_priv *mgp = netdev_priv(dev); struct myri10ge_slice_netstats *slice_stats; - struct net_device_stats *stats = &dev->stats; int i; spin_lock(&mgp->stats_lock); @@ -3790,7 +3792,7 @@ static const struct net_device_ops myri10ge_netdev_ops = { .ndo_open = myri10ge_open, .ndo_stop = myri10ge_close, .ndo_start_xmit = myri10ge_xmit, - .ndo_get_stats = myri10ge_get_stats, + .ndo_get_stats64 = myri10ge_get_stats, .ndo_validate_addr = eth_validate_addr, .ndo_change_mtu = myri10ge_change_mtu, .ndo_fix_features = myri10ge_fix_features, |