diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-05-29 22:54:24 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-05-29 22:54:24 -0700 |
| commit | b25e631dcc357f16d05fb2ac4f1570d7e86ec0ef (patch) | |
| tree | e49268da6abb834c02049ac982b364e991aecb2e /zebra/interface.c | |
| parent | b2d49f178cc69c580039c5fb058f6eba4a542b1f (diff) | |
| parent | 97dd2bf9bb517c428cfa2778cac071ad845d03a1 (diff) | |
| download | quagga-b25e631dcc357f16d05fb2ac4f1570d7e86ec0ef.tar.bz2 quagga-b25e631dcc357f16d05fb2ac4f1570d7e86ec0ef.tar.xz | |
Merge branch 'hollywood' of suva.vyatta.com:/git/vyatta-quagga into hollywood
Diffstat (limited to 'zebra/interface.c')
| -rw-r--r-- | zebra/interface.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/zebra/interface.c b/zebra/interface.c index f6d2ff9b..916c58a6 100644 --- a/zebra/interface.c +++ b/zebra/interface.c @@ -833,6 +833,7 @@ if_dump_vty (struct vty *vty, struct interface *ifp) #endif /* HAVE_NET_RT_IFLIST */ } +#if 0 /* Check supported address family. */ static int if_supported_family (int family) @@ -845,6 +846,7 @@ if_supported_family (int family) #endif /* HAVE_IPV6 */ return 0; } +#endif /* Wrapper hook point for zebra daemon so that ifindex can be set * DEFUN macro not used as extract.pl HAS to ignore this @@ -1032,6 +1034,9 @@ DEFUN (linkdetect, /* Enable FIB to remove kernel routes as well */ if_linkdetect_on(ifp->name); +#ifdef HAVE_IPV6 + if_linkdetect_ipv6_on(ifp->name); +#endif /* When linkdetection is enabled, if might come down */ if (!if_is_operative(ifp) && if_was_operative) if_down(ifp); @@ -1058,6 +1063,9 @@ DEFUN (no_linkdetect, /* Disable FIB update on link-detect */ if_linkdetect_off(ifp->name); +#ifdef HAVE_IPV6 + if_linkdetect_ipv6_off(ifp->name); +#endif /* Interface may come up after disabling link detection */ if (if_is_operative(ifp) && !if_was_operative) if_up(ifp); |