X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=vswitchd%2Fovs-vswitchd.c;h=a7b43f7b4f34535e3ce429e0f416bb579c8e5a20;hb=c798b21c6a;hp=e95ee0aae57a3703abaa599ab31b344a4c5fc3d1;hpb=e3fdfed11b8c56aa6a8deffe11a552fed7e7adbc;p=openvswitch diff --git a/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c index e95ee0aa..a7b43f7b 100644 --- a/vswitchd/ovs-vswitchd.c +++ b/vswitchd/ovs-vswitchd.c @@ -28,12 +28,13 @@ #include "command-line.h" #include "compiler.h" #include "daemon.h" +#include "dpif.h" #include "fault.h" #include "leak-checker.h" #include "mgmt.h" +#include "netdev.h" #include "ovs-vswitchd.h" #include "poll-loop.h" -#include "port.h" #include "proc-net-compat.h" #include "process.h" #include "signals.h" @@ -83,7 +84,6 @@ main(int argc, char *argv[]) cfg_read(); mgmt_init(); bridge_init(); - port_init(); mgmt_reconfigure(); need_reconfigure = false; @@ -100,6 +100,8 @@ main(int argc, char *argv[]) need_reconfigure = true; } unixctl_server_run(unixctl); + dp_run(); + netdev_run(); if (need_reconfigure) { poll_immediate_wake(); @@ -108,6 +110,8 @@ main(int argc, char *argv[]) mgmt_wait(); bridge_wait(); unixctl_server_wait(unixctl); + dp_wait(); + netdev_wait(); poll_block(); } @@ -130,7 +134,6 @@ reconfigure(void) cfg_read(); bridge_reconfigure(); mgmt_reconfigure(); - port_reconfigure(); for (i = 0; i < n_conns; i++) { unixctl_command_reply(conns[i], 202, NULL);