2
0
mirror of https://github.com/openvswitch/ovs synced 2025-08-30 22:05:19 +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

@@ -1028,12 +1028,12 @@ dpif_linux_recv_purge(struct dpif *dpif_)
const struct dpif_class dpif_linux_class = {
"system",
NULL, /* run */
NULL, /* wait */
dpif_linux_enumerate,
dpif_linux_open,
dpif_linux_close,
dpif_linux_destroy,
NULL, /* run */
NULL, /* wait */
dpif_linux_get_stats,
dpif_linux_get_drop_frags,
dpif_linux_set_drop_frags,