diff options
| author | Rick Balocca <rbalocca@vyatta.com> | 2008-10-16 17:39:55 -0700 |
|---|---|---|
| committer | Rick Balocca <rbalocca@vyatta.com> | 2008-10-16 17:39:55 -0700 |
| commit | 04c7298b3684ddda4e6669f14374e2377deb04ea (patch) | |
| tree | b3c11943294ffc282863dbca418d408a7869f86f /bgpd/bgp_zebra.c | |
| parent | 1581cf27e9e187a12f25221cc42123a056469adb (diff) | |
| parent | fa3e86a1a7559808ba5e32374e35d387472567c8 (diff) | |
| download | quagga-04c7298b3684ddda4e6669f14374e2377deb04ea.tar.bz2 quagga-04c7298b3684ddda4e6669f14374e2377deb04ea.tar.xz | |
Merge branch 'islavista'
Conflicts:
debian/changelog
Diffstat (limited to 'bgpd/bgp_zebra.c')
| -rw-r--r-- | bgpd/bgp_zebra.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c index ec1143af..943b1777 100644 --- a/bgpd/bgp_zebra.c +++ b/bgpd/bgp_zebra.c @@ -640,7 +640,6 @@ bgp_nexthop_set (union sockunion *local, union sockunion *remote, } #if 0 -#ifdef HAVE_IPV6 static unsigned int bgp_ifindex_by_nexthop (struct in6_addr *addr) { @@ -671,7 +670,6 @@ bgp_ifindex_by_nexthop (struct in6_addr *addr) } return 0; } -#endif /* HAVE_IPV6 */ #endif void |