diff options
| -rw-r--r-- | bgpd/rfapi/vnc_zebra.c | 8 | ||||
| -rw-r--r-- | lib/log.c | 4 | ||||
| -rw-r--r-- | lib/zclient.h | 4 | ||||
| -rw-r--r-- | zebra/zserv.c | 8 |
4 files changed, 4 insertions, 20 deletions
diff --git a/bgpd/rfapi/vnc_zebra.c b/bgpd/rfapi/vnc_zebra.c index 3075d4109f..8f4a550bde 100644 --- a/bgpd/rfapi/vnc_zebra.c +++ b/bgpd/rfapi/vnc_zebra.c @@ -527,8 +527,8 @@ static void vnc_zebra_route_msg(struct prefix *p, int nhp_count, void *nhp_ary, p->prefixlen, nhp_count); } - zapi_ipv4_route((add ? ZEBRA_IPV4_NEXTHOP_ADD - : ZEBRA_IPV4_NEXTHOP_DELETE), + zapi_ipv4_route((add ? ZEBRA_IPV4_ROUTE_ADD + : ZEBRA_IPV4_ROUTE_DELETE), zclient_vnc, (struct prefix_ipv4 *)p, &api); } else if (p->family == AF_INET6) { @@ -561,8 +561,8 @@ static void vnc_zebra_route_msg(struct prefix *p, int nhp_count, void *nhp_ary, p->prefixlen, nhp_count); } - zapi_ipv6_route((add ? ZEBRA_IPV6_NEXTHOP_ADD - : ZEBRA_IPV6_NEXTHOP_DELETE), + zapi_ipv6_route((add ? ZEBRA_IPV6_ROUTE_ADD + : ZEBRA_IPV6_ROUTE_DELETE), zclient_vnc, (struct prefix_ipv6 *)p, NULL, &api); } else { @@ -908,10 +908,6 @@ static const struct zebra_desc_table command_types[] = { DESC_ENTRY(ZEBRA_INTERFACE_LINK_PARAMS), DESC_ENTRY(ZEBRA_MPLS_LABELS_ADD), DESC_ENTRY(ZEBRA_MPLS_LABELS_DELETE), - DESC_ENTRY(ZEBRA_IPV4_NEXTHOP_ADD), - DESC_ENTRY(ZEBRA_IPV4_NEXTHOP_DELETE), - DESC_ENTRY(ZEBRA_IPV6_NEXTHOP_ADD), - DESC_ENTRY(ZEBRA_IPV6_NEXTHOP_DELETE), DESC_ENTRY(ZEBRA_IPMR_ROUTE_STATS), DESC_ENTRY(ZEBRA_LABEL_MANAGER_CONNECT), DESC_ENTRY(ZEBRA_GET_LABEL_CHUNK), diff --git a/lib/zclient.h b/lib/zclient.h index 15d1858d84..0218c1b732 100644 --- a/lib/zclient.h +++ b/lib/zclient.h @@ -100,10 +100,6 @@ typedef enum { ZEBRA_INTERFACE_LINK_PARAMS, ZEBRA_MPLS_LABELS_ADD, ZEBRA_MPLS_LABELS_DELETE, - ZEBRA_IPV4_NEXTHOP_ADD, - ZEBRA_IPV4_NEXTHOP_DELETE, - ZEBRA_IPV6_NEXTHOP_ADD, - ZEBRA_IPV6_NEXTHOP_DELETE, ZEBRA_IPMR_ROUTE_STATS, ZEBRA_LABEL_MANAGER_CONNECT, ZEBRA_GET_LABEL_CHUNK, diff --git a/zebra/zserv.c b/zebra/zserv.c index cd893b5670..aa7189fe89 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -2444,14 +2444,6 @@ static int zebra_client_read(struct thread *thread) case ZEBRA_IPV4_ROUTE_IPV6_NEXTHOP_ADD: zread_ipv4_route_ipv6_nexthop_add(client, length, zvrf); break; - case ZEBRA_IPV4_NEXTHOP_ADD: - zread_ipv4_add(client, length, - zvrf); /* LB: r1.0 merge - id was 1 */ - break; - case ZEBRA_IPV4_NEXTHOP_DELETE: - zread_ipv4_delete(client, length, - zvrf); /* LB: r1.0 merge - id was 1 */ - break; case ZEBRA_IPV6_ROUTE_ADD: zread_ipv6_add(client, length, zvrf); break; |