From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Sun, 14 May 2017 02:52:15 +0000 (-0400)
Subject: babeld: Cleanup some more compiler warnings
X-Git-Tag: reindent-master-before~74^2~28
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=0eb167b9f10efaee837efb163dc6d35b7aab1735;p=matthieu%2Ffrr.git

babeld: Cleanup some more compiler warnings

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/babeld/babel_zebra.c b/babeld/babel_zebra.c
index bec37c4e2c..537158ec4e 100644
--- a/babeld/babel_zebra.c
+++ b/babeld/babel_zebra.c
@@ -86,7 +86,7 @@ struct cmd_node zebra_node =
 /* Zebra route add and delete treatment (ipv6). */
 static int
 babel_zebra_read_ipv6 (int command, struct zclient *zclient,
-		       zebra_size_t length)
+		       zebra_size_t length, vrf_id_t vrf)
 {
     struct stream *s;
     struct zapi_ipv6 api;
@@ -138,7 +138,7 @@ babel_zebra_read_ipv6 (int command, struct zclient *zclient,
 
 static int
 babel_zebra_read_ipv4 (int command, struct zclient *zclient,
-		       zebra_size_t length)
+		       zebra_size_t length, vrf_id_t vrf)
 {
     struct stream *s;
     struct zapi_ipv4 api;
@@ -378,7 +378,7 @@ zebra_config_write (struct vty *vty)
         vty_out (vty, "no router zebra%s", VTY_NEWLINE);
         return 1;
     }
-    else if (! zclient->redist[ZEBRA_ROUTE_BABEL])
+    else if (! vrf_bitmap_check (zclient->redist[AFI_IP][ZEBRA_ROUTE_BABEL], VRF_DEFAULT))
     {
         vty_out (vty, "router zebra%s", VTY_NEWLINE);
         vty_out (vty, " no redistribute babel%s", VTY_NEWLINE);
diff --git a/babeld/route.c b/babeld/route.c
index 1983c5eec0..501dd1f4df 100644
--- a/babeld/route.c
+++ b/babeld/route.c
@@ -997,7 +997,6 @@ retract_neighbour_routes(struct neighbour *neigh)
             }
             r = r->next;
         }
-        i++;
     }
 }