2
0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 06:15:47 +00:00

Merge 'next' into 'master'.

I know already that this breaks the statsfixes that were implemented by the
following commits:

827ab71c97 "ofproto: Datapath statistics accounted twice."
6f1435fc8f "ofproto: Resubmit statistics improperly account during..."

These were already broken in a previous merge.  I will work on a fix.
This commit is contained in:
Ben Pfaff
2011-05-18 14:01:13 -07:00
53 changed files with 7808 additions and 5220 deletions

View File

@@ -3974,6 +3974,8 @@ netdev_stats_to_rtnl_link_stats64(struct rtnl_link_stats64 *dst,
const struct netdev_stats *src)
{
COPY_NETDEV_STATS;
dst->rx_compressed = 0;
dst->tx_compressed = 0;
}
/* Utility functions. */