diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-31 07:36:57 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-31 08:07:27 -0500 |
| commit | 6bcc7f4b7ed40169802404c22bb619665730d5fa (patch) | |
| tree | af521458c9da1dca191e23b8ded7a1c5427d2588 /zebra/zebra_rib.c | |
| parent | a118e71d0e01e7923522f13e5ddd0f9e2803ec0a (diff) | |
zebra: Do not force NEXTHOP_TYPE to XXX_IFINDEX
The original goal of the zebra change was to force all:
NEXTHOP_TYPE_IPV4 -> NEXTHOP_TYPE_IPV4_IFINDEX
NEXTHOP_TYPE_IPV6 -> NEXTHOP_TYPE_IPV6_IFINDEX
This causes issues in routes being installed into the kernel
backing this out until I can get time to fully understand
what is going wrong.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'zebra/zebra_rib.c')
| -rw-r--r-- | zebra/zebra_rib.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index 7faf4c7e04..c1c1f897a1 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -471,16 +471,9 @@ nexthop_active (afi_t afi, struct rib *rib, struct nexthop *nexthop, int set, newhop = match->nexthop; if (newhop) { - if (nexthop->type == NEXTHOP_TYPE_IPV4) - { - nexthop->ifindex = newhop->ifindex; - nexthop->type = NEXTHOP_TYPE_IPV4; - } - if (nexthop->type == NEXTHOP_TYPE_IPV6) - { - nexthop->ifindex = newhop->ifindex; - nexthop->type = NEXTHOP_TYPE_IPV6_IFINDEX; - } + if (nexthop->type == NEXTHOP_TYPE_IPV4 || + nexthop->type == NEXTHOP_TYPE_IPV6) + nexthop->ifindex = newhop->ifindex; } return 1; } |