[ovs-dev] [rtnl_link_stats64 v2 3/4] datapath: Clean up netdev_get_stats() very slightly.

Ben Pfaff blp at nicira.com
Thu Nov 4 21:37:56 UTC 2010


dev_get_stats() is documented to return its output argument, so there's no
need to maintain a separate pointer variable.

Signed-off-by: Ben Pfaff <blp at nicira.com>
---
 datapath/vport-netdev.c |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/datapath/vport-netdev.c b/datapath/vport-netdev.c
index fce9b39..bc1637b 100644
--- a/datapath/vport-netdev.c
+++ b/datapath/vport-netdev.c
@@ -211,22 +211,22 @@ struct kobject *netdev_get_kobj(const struct vport *vport)
 int netdev_get_stats(const struct vport *vport, struct odp_vport_stats *stats)
 {
 	const struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
-	struct rtnl_link_stats64 *netdev_stats, storage;
-
-	netdev_stats = dev_get_stats(netdev_vport->dev, &storage);
-
-	stats->rx_bytes		= netdev_stats->rx_bytes;
-	stats->rx_packets	= netdev_stats->rx_packets;
-	stats->tx_bytes		= netdev_stats->tx_bytes;
-	stats->tx_packets	= netdev_stats->tx_packets;
-	stats->rx_dropped	= netdev_stats->rx_dropped;
-	stats->rx_errors	= netdev_stats->rx_errors;
-	stats->rx_frame_err	= netdev_stats->rx_frame_errors;
-	stats->rx_over_err	= netdev_stats->rx_over_errors;
-	stats->rx_crc_err	= netdev_stats->rx_crc_errors;
-	stats->tx_dropped	= netdev_stats->tx_dropped;
-	stats->tx_errors	= netdev_stats->tx_errors;
-	stats->collisions	= netdev_stats->collisions;
+	struct rtnl_link_stats64 netdev_stats;
+
+	dev_get_stats(netdev_vport->dev, &netdev_stats);
+
+	stats->rx_bytes		= netdev_stats.rx_bytes;
+	stats->rx_packets	= netdev_stats.rx_packets;
+	stats->tx_bytes		= netdev_stats.tx_bytes;
+	stats->tx_packets	= netdev_stats.tx_packets;
+	stats->rx_dropped	= netdev_stats.rx_dropped;
+	stats->rx_errors	= netdev_stats.rx_errors;
+	stats->rx_frame_err	= netdev_stats.rx_frame_errors;
+	stats->rx_over_err	= netdev_stats.rx_over_errors;
+	stats->rx_crc_err	= netdev_stats.rx_crc_errors;
+	stats->tx_dropped	= netdev_stats.tx_dropped;
+	stats->tx_errors	= netdev_stats.tx_errors;
+	stats->collisions	= netdev_stats.collisions;
 
 	return 0;
 }
-- 
1.7.1





More information about the dev mailing list