summaryrefslogtreecommitdiffstats
path: root/zebra/zebra_rib.c
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2008-05-15 15:07:49 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2008-05-15 15:07:49 -0700
commit1d909aa44b4738214d5b0b846d591e3c7bd044ae (patch)
tree3d41d043610442934edb179168ca5ff59f357ee2 /zebra/zebra_rib.c
parentd798c27bfa776ac437b33981e66aecc1485df12d (diff)
parentebde268b05fe09bf50e20cb4261c555dce145ee1 (diff)
downloadquagga-1d909aa44b4738214d5b0b846d591e3c7bd044ae.tar.bz2
quagga-1d909aa44b4738214d5b0b846d591e3c7bd044ae.tar.xz
Merge branch 'hollywood' of suva.vyatta.com:/git/vyatta-quagga into hollywood
Diffstat (limited to 'zebra/zebra_rib.c')
-rw-r--r--zebra/zebra_rib.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 24975f71..5ae556bf 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -411,7 +411,8 @@ nexthop_active_ipv4 (struct rib *rib, struct nexthop *nexthop, int set,
}
return 1;
}
- else if (CHECK_FLAG (rib->flags, ZEBRA_FLAG_INTERNAL))
+ else if (CHECK_FLAG (rib->flags, ZEBRA_FLAG_INTERNAL) ||
+ match->type == ZEBRA_ROUTE_STATIC)
{
for (newhop = match->nexthop; newhop; newhop = newhop->next)
if (CHECK_FLAG (newhop->flags, NEXTHOP_FLAG_FIB)