diff options
| author | vivek <vivek@cumulusnetworks.com> | 2015-12-08 17:01:20 -0800 |
|---|---|---|
| committer | vivek <vivek@cumulusnetworks.com> | 2015-12-08 17:01:20 -0800 |
| commit | 3d63d59fd1ac70e3bdfc243a40d1cfbc5c547ac6 (patch) | |
| tree | 2a90fc4f84ed361d8509a52aa33e1b9a926adcdf /zebra/rt_socket.c | |
| parent | 1c8481370f49d491d5afe84af9bf8613b257afb2 (diff) | |
| parent | ef16372d77e3822c13f23370e55a280b784aeef2 (diff) | |
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
Diffstat (limited to 'zebra/rt_socket.c')
| -rw-r--r-- | zebra/rt_socket.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/zebra/rt_socket.c b/zebra/rt_socket.c index 9af2d61dbb..cc327ffbb0 100644 --- a/zebra/rt_socket.c +++ b/zebra/rt_socket.c @@ -123,7 +123,6 @@ kernel_rtm_ipv4 (int cmd, struct prefix *p, struct rib *rib, int family) gate = 1; } if (nexthop->type == NEXTHOP_TYPE_IFINDEX - || nexthop->type == NEXTHOP_TYPE_IFNAME || nexthop->type == NEXTHOP_TYPE_IPV4_IFINDEX) ifindex = nexthop->ifindex; if (nexthop->type == NEXTHOP_TYPE_BLACKHOLE) @@ -388,15 +387,12 @@ kernel_rtm_ipv6_multipath (int cmd, struct prefix *p, struct rib *rib, )) { if (nexthop->type == NEXTHOP_TYPE_IPV6 - || nexthop->type == NEXTHOP_TYPE_IPV6_IFNAME || nexthop->type == NEXTHOP_TYPE_IPV6_IFINDEX) { sin_gate.sin6_addr = nexthop->gate.ipv6; gate = 1; } if (nexthop->type == NEXTHOP_TYPE_IFINDEX - || nexthop->type == NEXTHOP_TYPE_IFNAME - || nexthop->type == NEXTHOP_TYPE_IPV6_IFNAME || nexthop->type == NEXTHOP_TYPE_IPV6_IFINDEX) ifindex = nexthop->ifindex; |