From: Jesse Gross Date: Wed, 5 Jan 2011 15:25:41 +0000 (-0800) Subject: datapath: Fix double counting of packet stats for Linux devices. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0971d127d038e0279b3b9cb2f6ccd060ddaee9e5;p=openvswitch datapath: Fix double counting of packet stats for Linux devices. The kernel augments stats for Linux devices that only provide 32-bit stats with its own internal 64-bit counters. When doing this it takes the error stats from the device but uses the packet and byte values from its local counters. However, we were also taking the packet and byte counts from the device, leading to double counting. Problem introduced by commit ec61a01cd8ed73b13ffe042ddff4baf41f6b63e7 'datapath: Use "struct rtnl_link_stats64" instead of "struct odp_vport_stats".'. Bug #4327 Reported-by: Krishna Miriyala Signed-off-by: Jesse Gross Acked-by: Ben Pfaff --- diff --git a/datapath/vport.c b/datapath/vport.c index a3244a3e..d7330f85 100644 --- a/datapath/vport.c +++ b/datapath/vport.c @@ -833,10 +833,6 @@ int vport_get_stats(struct vport *vport, struct rtnl_link_stats64 *stats) spin_unlock_bh(&vport->stats_lock); if (dev_statsp) { - stats->rx_packets += dev_statsp->rx_packets; - stats->tx_packets += dev_statsp->tx_packets; - stats->rx_bytes += dev_statsp->rx_bytes; - stats->tx_bytes += dev_statsp->tx_bytes; stats->rx_errors += dev_statsp->rx_errors; stats->tx_errors += dev_statsp->tx_errors; stats->rx_dropped += dev_statsp->rx_dropped;