proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 12:39:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

babeld: Cleanup some more compiler warnings

Browse Source 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-05-13 22:52:15 -04:00
parent dd15627e26
commit 0eb167b9f1
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
babeld/babel_zebra.c
View File

@ -86,7 +86,7 @@ struct cmd_node zebra_node =
/* Zebra route add and delete treatment (ipv6). */ /* Zebra route add and delete treatment (ipv6). */
static int static int
babel_zebra_read_ipv6 (int command, struct zclient *zclient, 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 stream *s;
struct zapi_ipv6 api; struct zapi_ipv6 api;
@ -138,7 +138,7 @@ babel_zebra_read_ipv6 (int command, struct zclient *zclient,
static int static int
babel_zebra_read_ipv4 (int command, struct zclient *zclient, 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 stream *s;
struct zapi_ipv4 api; struct zapi_ipv4 api;
@ -378,7 +378,7 @@ zebra_config_write (struct vty *vty)
vty_out (vty, "no router zebra%s", VTY_NEWLINE); vty_out (vty, "no router zebra%s", VTY_NEWLINE);
return 1; 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, "router zebra%s", VTY_NEWLINE);
vty_out (vty, " no redistribute babel%s", VTY_NEWLINE); vty_out (vty, " no redistribute babel%s", VTY_NEWLINE);

1
babeld/route.c
View File

@ -997,7 +997,6 @@ retract_neighbour_routes(struct neighbour *neigh)
} }
r = r->next; r = r->next;
} }
i++;
} }
} }