diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-04-29 16:57:46 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-04-29 16:57:46 -0700 |
| commit | 781a20a48ea2a82d89258a8e20d89dcc4f90ea07 (patch) | |
| tree | 3c4b9523de8a509a16babc190b2ea5e16533b1ac /zebra/zebra_rib.c | |
| parent | 4a30f6fe0f0b692e9d1f1d1678b9c2bd0e3afe7f (diff) | |
| parent | a8726835c9064a1f2c6a261b14c637950abdd2bc (diff) | |
| download | quagga-781a20a48ea2a82d89258a8e20d89dcc4f90ea07.tar.bz2 quagga-781a20a48ea2a82d89258a8e20d89dcc4f90ea07.tar.xz | |
Merge branch 'hollister' into hollywood
Diffstat (limited to 'zebra/zebra_rib.c')
| -rw-r--r-- | zebra/zebra_rib.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index 7a6c7050..24975f71 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -428,17 +428,17 @@ nexthop_active_ipv4 (struct rib *rib, struct nexthop *nexthop, int set, || newhop->type == NEXTHOP_TYPE_IFNAME || newhop->type == NEXTHOP_TYPE_IPV4_IFINDEX) nexthop->rifindex = newhop->ifindex; + } - if (newhop->type == NEXTHOP_TYPE_IFINDEX) - { - ifp = if_lookup_by_index (newhop->ifindex); - return (ifp && if_is_operative (ifp)); - } - else if (newhop && newhop->type == NEXTHOP_TYPE_IFNAME) - { - ifp = if_lookup_by_name(newhop->ifname); - return (ifp && if_is_operative (ifp)); - } + if (newhop->type == NEXTHOP_TYPE_IFINDEX) + { + ifp = if_lookup_by_index (newhop->ifindex); + return (ifp && if_is_operative (ifp)); + } + else if (newhop && newhop->type == NEXTHOP_TYPE_IFNAME) + { + ifp = if_lookup_by_name(newhop->ifname); + return (ifp && if_is_operative (ifp)); } return 1; } @@ -550,17 +550,17 @@ nexthop_active_ipv6 (struct rib *rib, struct nexthop *nexthop, int set, || newhop->type == NEXTHOP_TYPE_IPV6_IFINDEX || newhop->type == NEXTHOP_TYPE_IPV6_IFNAME) nexthop->rifindex = newhop->ifindex; + } - if (newhop && newhop->type == NEXTHOP_TYPE_IFINDEX) - { - ifp = if_lookup_by_index (newhop->ifindex); - return (ifp && if_is_operative (ifp)); - } - else if (newhop && newhop->type == NEXTHOP_TYPE_IFNAME) - { - ifp = if_lookup_by_name(newhop->ifname); - return (ifp && if_is_operative (ifp)); - } + if (newhop && newhop->type == NEXTHOP_TYPE_IFINDEX) + { + ifp = if_lookup_by_index (newhop->ifindex); + return (ifp && if_is_operative (ifp)); + } + else if (newhop && newhop->type == NEXTHOP_TYPE_IFNAME) + { + ifp = if_lookup_by_name(newhop->ifname); + return (ifp && if_is_operative (ifp)); } return 1; } |