diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-10-21 16:05:03 -0400 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-10-21 16:05:03 -0400 |
| commit | 882261e18b9632092d2e7f226f68e2a1c54a7241 (patch) | |
| tree | ea0ddd6d95606b07a4b84a6cda03f2ab31463b54 /zebra/zebra_static.c | |
| parent | aac9ef6cb0169ea96debe2872066021608631c16 (diff) | |
| parent | 36602be128d4f4e49c19555a194430b9691c9a30 (diff) | |
Merge remote-tracking branch 'origin/cmaster' into cmaster-next
Diffstat (limited to 'zebra/zebra_static.c')
| -rw-r--r-- | zebra/zebra_static.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/zebra/zebra_static.c b/zebra/zebra_static.c index a691048b2c..298fc4e09d 100644 --- a/zebra/zebra_static.c +++ b/zebra/zebra_static.c @@ -81,7 +81,7 @@ static_install_route (afi_t afi, safi_t safi, struct prefix *p, struct static_ro case STATIC_IFINDEX: nexthop = rib_nexthop_ifindex_add (rib, si->ifindex); break; - case STATIC_IPV4_BLACKHOLE: + case STATIC_BLACKHOLE: nexthop = rib_nexthop_blackhole_add (rib); break; case STATIC_IPV6_GATEWAY: @@ -145,7 +145,7 @@ static_install_route (afi_t afi, safi_t safi, struct prefix *p, struct static_ro case STATIC_IFINDEX: nexthop = rib_nexthop_ifindex_add (rib, si->ifindex); break; - case STATIC_IPV4_BLACKHOLE: + case STATIC_BLACKHOLE: nexthop = rib_nexthop_blackhole_add (rib); break; case STATIC_IPV6_GATEWAY: @@ -219,7 +219,7 @@ static_nexthop_same (struct nexthop *nexthop, struct static_route *si) int gw_match = 0; if (nexthop->type == NEXTHOP_TYPE_BLACKHOLE - && si->type == STATIC_IPV4_BLACKHOLE) + && si->type == STATIC_BLACKHOLE) return 1; if (nexthop->type == NEXTHOP_TYPE_IPV4 |