summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhao Qiang <qiang.zhao@nxp.com>2017-08-17 03:33:25 (GMT)
committerXie Xiaobo <xiaobo.xie@nxp.com>2017-12-12 07:32:38 (GMT)
commit863f99812459396fe3431dbd1ba3f773a0d1285f (patch)
tree5f3f327f148510a5d59cd4c817a8ccfdc0166d46
parent0c6d73db6933ef14409b81abf0cad6d8ed3f70f0 (diff)
downloadlinux-863f99812459396fe3431dbd1ba3f773a0d1285f.tar.xz
DPAA: adjust DPAA to adapt to Linux 4.9
-rw-r--r--drivers/net/ethernet/freescale/dpaa/dpaa_eth.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
index e2af0a1..62f3b3a 100644
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
@@ -321,8 +321,8 @@ static void dpaa_tx_timeout(struct net_device *net_dev)
/* Calculates the statistics for the given device by adding the statistics
* collected by each CPU.
*/
-static void dpaa_get_stats64(struct net_device *net_dev,
- struct rtnl_link_stats64 *s)
+static struct rtnl_link_stats64 *dpaa_get_stats64(struct net_device *net_dev,
+ struct rtnl_link_stats64 *s)
{
int numstats = sizeof(struct rtnl_link_stats64) / sizeof(u64);
struct dpaa_priv *priv = netdev_priv(net_dev);
@@ -340,6 +340,8 @@ static void dpaa_get_stats64(struct net_device *net_dev,
for (j = 0; j < numstats; j++)
netstats[j] += cpustats[j];
}
+
+ return s;
}
static int dpaa_setup_tc(struct net_device *net_dev, u32 handle, __be16 proto,