X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=utilities%2Fovs-controller.c;h=40e2a801da63ca01f3d37d062655f262f5147fdf;hb=e4af561537cfea7d35d2075596b4474847876794;hp=42431bb081f3f23097d19aa26b3af5ef74e2a066;hpb=882c2399908b0f33f73651ccfc3aaf76a7858ce4;p=openvswitch

diff --git a/utilities/ovs-controller.c b/utilities/ovs-controller.c
index 42431bb0..40e2a801 100644
--- a/utilities/ovs-controller.c
+++ b/utilities/ovs-controller.c
@@ -71,7 +71,7 @@ static bool mute = false;
 /* -q, --queue: OpenFlow queue to use, or the default queue if UINT32_MAX. */
 static uint32_t queue_id = UINT32_MAX;
 
-/* --with-flows: File with flows to send to switch, or null to not load 
+/* --with-flows: File with flows to send to switch, or null to not load
  * any default flows. */
 static FILE *flow_file = NULL;
 
@@ -107,7 +107,6 @@ main(int argc, char *argv[])
     for (i = optind; i < argc; i++) {
         const char *name = argv[i];
         struct vconn *vconn;
-        int retval;
 
         retval = vconn_open(name, OFP_VERSION, &vconn);
         if (!retval) {
@@ -146,12 +145,10 @@ main(int argc, char *argv[])
 
     while (n_switches > 0 || n_listeners > 0) {
         int iteration;
-        int i;
 
         /* Accept connections on listening vconns. */
         for (i = 0; i < n_listeners && n_switches < MAX_SWITCHES; ) {
             struct vconn *new_vconn;
-            int retval;
 
             retval = pvconn_accept(listeners[i], OFP_VERSION, &new_vconn);
             if (!retval || retval == EAGAIN) {
@@ -171,7 +168,8 @@ main(int argc, char *argv[])
             bool progress = false;
             for (i = 0; i < n_switches; ) {
                 struct switch_ *this = &switches[i];
-                int retval = do_switching(this);
+
+                retval = do_switching(this);
                 if (!retval || retval == EAGAIN) {
                     if (!retval) {
                         progress = true;
@@ -189,7 +187,7 @@ main(int argc, char *argv[])
         }
         for (i = 0; i < n_switches; i++) {
             struct switch_ *this = &switches[i];
-            lswitch_run(this->lswitch, this->rconn);
+            lswitch_run(this->lswitch);
         }
 
         unixctl_server_run(unixctl);