Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5f7ef72 authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

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: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f20530bc

drivers/net/myri10ge/myri10ge.c

+8 −6
Original line number Diff line number Diff line
@@ -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 @@ static netdev_tx_t myri10ge_sw_tso(struct sk_buff *skb, 
	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,