diff options
| author | Ben Pfaff <blp@nicira.com> | 2011-05-18 14:01:13 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2011-05-18 14:01:13 -0700 |
| commit | b2fda3effc787f265b5ad5dfa967ac00627bd075 (patch) | |
| tree | 5c0017aedd36c0d9088dcd67a79beb8ff69bd4f9 /vswitchd/ovs-vswitchd.c | |
| parent | 827ab71c97f25b77c94a1158834cdad35df6806f (diff) | |
| parent | 2e281761473ed67ecae00205f62180e9a21c9ade (diff) | |
| download | openvswitch-b2fda3effc787f265b5ad5dfa967ac00627bd075.tar.gz | |
Merge 'next' into 'master'.
I know already that this breaks the statsfixes that were implemented by the
following commits:
827ab71c97f "ofproto: Datapath statistics accounted twice."
6f1435fc8f7 "ofproto: Resubmit statistics improperly account during..."
These were already broken in a previous merge. I will work on a fix.
Diffstat (limited to 'vswitchd/ovs-vswitchd.c')
| -rw-r--r-- | vswitchd/ovs-vswitchd.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c index 441dfb225..d591e951e 100644 --- a/vswitchd/ovs-vswitchd.c +++ b/vswitchd/ovs-vswitchd.c @@ -30,7 +30,6 @@ #include "command-line.h" #include "compiler.h" #include "daemon.h" -#include "dpif.h" #include "dummy.h" #include "leak-checker.h" #include "netdev.h" @@ -90,13 +89,11 @@ main(int argc, char *argv[]) } bridge_run(); unixctl_server_run(unixctl); - dp_run(); netdev_run(); signal_wait(sighup); bridge_wait(); unixctl_server_wait(unixctl); - dp_wait(); netdev_wait(); if (exiting) { poll_immediate_wake(); |