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 <krishna@nicira.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>

diff --git a/datapath/vport.c b/datapath/vport.c
index a3244a3ec6a053e46b25765117888b6909bfde1b..d7330f855931f32e249f4f8469a18da84b177a98 100644 (file)
--- 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;