From: stephen hemminger <[email protected]>
Upstream commit:
commit bc1f44709cf27fb2a5766cadafe7e2ad5e9cb221
Author: stephen hemminger <[email protected]>
Date: Fri Jan 6 19:12:52 2017 -0800
net: make ndo_get_stats64 a void function
The network device operation for reading statistics is only called
in one place, and it ignores the return value. Having a structure
return value is potentially confusing because some future driver could
incorrectly assume that the return value was used.
Fix all drivers with ndo_get_stats64 to have a void function.
Signed-off-by: Stephen Hemminger <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
This seems to be fine for all prior Linux versions as well.
Signed-off-by: Jarno Rajahalme <[email protected]>
Signed-off-by: Joe Stringer <[email protected]>
---
datapath/vport-internal_dev.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/datapath/vport-internal_dev.c b/datapath/vport-internal_dev.c
index 2988e8c..2fa9ab9 100644
--- a/datapath/vport-internal_dev.c
+++ b/datapath/vport-internal_dev.c
@@ -117,7 +117,7 @@ static void internal_dev_destructor(struct net_device *dev)
free_netdev(dev);
}
-static struct rtnl_link_stats64 *
+static void
internal_get_stats(struct net_device *dev, struct rtnl_link_stats64 *stats)
{
int i;
@@ -145,8 +145,6 @@ internal_get_stats(struct net_device *dev, struct
rtnl_link_stats64 *stats)
stats->tx_bytes += local_stats.tx_bytes;
stats->tx_packets += local_stats.tx_packets;
}
-
- return stats;
}
#ifdef HAVE_IFF_PHONY_HEADROOM
@@ -164,7 +162,7 @@ static const struct net_device_ops internal_dev_netdev_ops
= {
#ifndef HAVE_NET_DEVICE_WITH_MAX_MTU
.ndo_change_mtu = internal_dev_change_mtu,
#endif
- .ndo_get_stats64 = internal_get_stats,
+ .ndo_get_stats64 = (void *)internal_get_stats,
#ifdef HAVE_IFF_PHONY_HEADROOM
#ifndef HAVE_NET_DEVICE_OPS_WITH_EXTENDED
.ndo_set_rx_headroom = internal_set_rx_headroom,
--
2.1.4
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
