Commit 3f5a2ef1 authored by Quan Nguyen's avatar Quan Nguyen Committed by David S. Miller

drivers: net: xgene: Remove redundant local stats

Commit 5944701d ("net: remove useless memset's in drivers get_stats64")
makes the pdata->stats redundant. This patch removes pdata->stats and
updates get_stats64() callback accordingly.
Signed-off-by: default avatarQuan Nguyen <qnguyen@apm.com>
Signed-off-by: default avatarIyappan Subramanian <isubramanian@apm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d09d3629
...@@ -25,7 +25,7 @@ struct xgene_gstrings_stats { ...@@ -25,7 +25,7 @@ struct xgene_gstrings_stats {
int offset; int offset;
}; };
#define XGENE_STAT(m) { #m, offsetof(struct xgene_enet_pdata, stats.m) } #define XGENE_STAT(m) { #m, offsetof(struct rtnl_link_stats64, m) }
static const struct xgene_gstrings_stats gstrings_stats[] = { static const struct xgene_gstrings_stats gstrings_stats[] = {
XGENE_STAT(rx_packets), XGENE_STAT(rx_packets),
...@@ -156,11 +156,12 @@ static void xgene_get_ethtool_stats(struct net_device *ndev, ...@@ -156,11 +156,12 @@ static void xgene_get_ethtool_stats(struct net_device *ndev,
struct ethtool_stats *dummy, struct ethtool_stats *dummy,
u64 *data) u64 *data)
{ {
void *pdata = netdev_priv(ndev); struct rtnl_link_stats64 stats;
int i; int i;
dev_get_stats(ndev, &stats);
for (i = 0; i < XGENE_STATS_LEN; i++) for (i = 0; i < XGENE_STATS_LEN; i++)
*data++ = *(u64 *)(pdata + gstrings_stats[i].offset); data[i] = *(u64 *)((char *)&stats + gstrings_stats[i].offset);
} }
static void xgene_get_pauseparam(struct net_device *ndev, static void xgene_get_pauseparam(struct net_device *ndev,
......
...@@ -1466,10 +1466,9 @@ static int xgene_enet_create_desc_rings(struct net_device *ndev) ...@@ -1466,10 +1466,9 @@ static int xgene_enet_create_desc_rings(struct net_device *ndev)
static void xgene_enet_get_stats64( static void xgene_enet_get_stats64(
struct net_device *ndev, struct net_device *ndev,
struct rtnl_link_stats64 *storage) struct rtnl_link_stats64 *stats)
{ {
struct xgene_enet_pdata *pdata = netdev_priv(ndev); struct xgene_enet_pdata *pdata = netdev_priv(ndev);
struct rtnl_link_stats64 *stats = &pdata->stats;
struct xgene_enet_desc_ring *ring; struct xgene_enet_desc_ring *ring;
int i; int i;
...@@ -1493,7 +1492,6 @@ static void xgene_enet_get_stats64( ...@@ -1493,7 +1492,6 @@ static void xgene_enet_get_stats64(
stats->rx_dropped += ring->rx_dropped; stats->rx_dropped += ring->rx_dropped;
} }
} }
memcpy(storage, stats, sizeof(struct rtnl_link_stats64));
} }
static int xgene_enet_set_mac_address(struct net_device *ndev, void *addr) static int xgene_enet_set_mac_address(struct net_device *ndev, void *addr)
......
...@@ -219,7 +219,6 @@ struct xgene_enet_pdata { ...@@ -219,7 +219,6 @@ struct xgene_enet_pdata {
int phy_mode; int phy_mode;
enum xgene_enet_rm rm; enum xgene_enet_rm rm;
struct xgene_enet_cle cle; struct xgene_enet_cle cle;
struct rtnl_link_stats64 stats;
const struct xgene_mac_ops *mac_ops; const struct xgene_mac_ops *mac_ops;
spinlock_t mac_lock; /* mac lock */ spinlock_t mac_lock; /* mac lock */
const struct xgene_port_ops *port_ops; const struct xgene_port_ops *port_ops;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment