diff options
| author |   Keerthy <j-keerthy@ti.com> | 2017-01-11 09:03:29 +0530 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-01-11 10:48:21 -0500 |
| commit | 380043b9dee4579174027f45d4554459d6bb4c38 (patch) | |
| tree | 76a998812f051fcffa58fbbfb9bffdfcdbb814fe /drivers/net/ethernet/ti/netcp_core.c | |
| parent | Merge branch 'dsa-phys_port_name' (diff) | |
| download | linux-dev-380043b9dee4579174027f45d4554459d6bb4c38.tar.xz linux-dev-380043b9dee4579174027f45d4554459d6bb4c38.zip | |
net: netcp: correct netcp_get_stats function signature
Commit: bc1f44709cf2 - net: make ndo_get_stats64 a void function
and
Commit: 6a8162e99ef3 - net: netcp: store network statistics in 64 bits.
The commit 6a8162e99ef3 adds ndo_get_stats64 function as per old
signature which causes compilation error:
drivers/net/ethernet/ti/netcp_core.c:1951:28: error:
initialization from incompatible pointer type
.ndo_get_stats64 = netcp_get_stats,
Hence correct netcp_get_stats function signature as per
the latest definition.
Signed-off-by: Keerthy <j-keerthy@ti.com>
Fixes: 6a8162e99ef344fc ("net: netcp: store network statistics in 64 bits")
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ti/netcp_core.c')
| -rw-r--r-- | drivers/net/ethernet/ti/netcp_core.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c index 68a75cc0731c..2b56eed249f7 100644 --- a/drivers/net/ethernet/ti/netcp_core.c +++ b/drivers/net/ethernet/ti/netcp_core.c @@ -1909,7 +1909,7 @@ static int netcp_setup_tc(struct net_device *dev, u32 handle, __be16 proto, return 0; } -static struct rtnl_link_stats64 * +static void netcp_get_stats(struct net_device *ndev, struct rtnl_link_stats64 *stats) { struct netcp_intf *netcp = netdev_priv(ndev); @@ -1938,8 +1938,6 @@ netcp_get_stats(struct net_device *ndev, struct rtnl_link_stats64 *stats) stats->rx_errors = p->rx_errors; stats->rx_dropped = p->rx_dropped; stats->tx_dropped = p->tx_dropped; - - return stats; } static const struct net_device_ops netcp_netdev_ops = { |