projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovsdb: Remove trailing whitespace
[openvswitch]
/
vswitchd
/
ovs-vswitchd.c
diff --git
a/vswitchd/ovs-vswitchd.c
b/vswitchd/ovs-vswitchd.c
index a027b8cfe83d339f6cb7ea23b0c1a826136185cf..0371e5711d75c608af0754b6174a597fdbb8f5f2 100644
(file)
--- a/
vswitchd/ovs-vswitchd.c
+++ b/
vswitchd/ovs-vswitchd.c
@@
-45,10
+45,10
@@
#include "unixctl.h"
#include "util.h"
#include "vconn.h"
#include "unixctl.h"
#include "util.h"
#include "vconn.h"
+#include "vlog.h"
#include "vswitchd/vswitch-idl.h"
#include "vswitchd/vswitch-idl.h"
-#include "vlog.h"
-#define THIS_MODULE VLM_vswitchd
+VLOG_DEFINE_THIS_MODULE(vswitchd);
static unixctl_cb_func ovs_vswitchd_exit;
static unixctl_cb_func ovs_vswitchd_exit;
@@
-99,6
+99,9
@@
main(int argc, char *argv[])
unixctl_server_wait(unixctl);
dp_wait();
netdev_wait();
unixctl_server_wait(unixctl);
dp_wait();
netdev_wait();
+ if (exiting) {
+ poll_immediate_wake();
+ }
poll_block();
}
poll_block();
}