diff options
| author | vivek <vivek@cumulusnetworks.com> | 2016-07-19 19:36:04 -0700 |
|---|---|---|
| committer | vivek <vivek@cumulusnetworks.com> | 2016-07-19 19:36:04 -0700 |
| commit | 163bf582cf6ca71bb43e263f8ab172df62ab358b (patch) | |
| tree | 4ffabfa86d1c2c789a23731001c0d705574031ad /zebra/zebra_rib.c | |
| parent | 58136de99d37b5f5d9905e43f2e385d29f751251 (diff) | |
| parent | 258e5a0d1b831388dbdc11f2975182e298d881ca (diff) | |
Merge branch 'cmaster-next' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster-next
Diffstat (limited to 'zebra/zebra_rib.c')
| -rw-r--r-- | zebra/zebra_rib.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index d70f528f5a..8a2728a890 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -405,6 +405,10 @@ nexthop_active_ipv4 (struct rib *rib, struct nexthop *nexthop, int set, { if (CHECK_FLAG (match->status, RIB_ENTRY_REMOVED)) continue; + + /* if the next hop is imported from another table, skip it */ + if (match->type == ZEBRA_ROUTE_TABLE) + continue; if (CHECK_FLAG (match->flags, ZEBRA_FLAG_SELECTED)) break; } |