diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-11-20 07:12:30 -0800 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-11-20 07:12:30 -0800 |
| commit | 8afc891ac75f2b1f17d9190ef8de5378ec55fcd5 (patch) | |
| tree | 113524294da47562a3e1c24920e5917d5dd9f31e /zebra/interface.h | |
| parent | 70d43d7cd31964f8b7c2908d93b186a4c3caf3db (diff) | |
| parent | 8da4e9466a3a3cdbfbc36e92528a9c8f395b230c (diff) | |
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
Diffstat (limited to 'zebra/interface.h')
| -rw-r--r-- | zebra/interface.h | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/zebra/interface.h b/zebra/interface.h index ba76d3e845..650b62a458 100644 --- a/zebra/interface.h +++ b/zebra/interface.h @@ -37,16 +37,7 @@ #define IF_ZEBRA_SHUTDOWN_OFF 0 #define IF_ZEBRA_SHUTDOWN_ON 1 -/* Router advertisement feature. */ -#ifndef RTADV -#if (defined(LINUX_IPV6) && (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1)) || defined(KAME) - #ifdef HAVE_RTADV - #define RTADV - #endif -#endif -#endif - -#ifdef RTADV +#if defined (HAVE_RTADV) /* Router advertisement parameter. From RFC4861, RFC6275 and RFC4191. */ struct rtadvconf { @@ -180,7 +171,7 @@ struct rtadvconf #define RTADV_PREF_MEDIUM 0x0 /* Per RFC4191. */ }; -#endif /* RTADV */ +#endif /* HAVE_RTADV */ /* `zebra' daemon local interface structure. */ struct zebra_if @@ -197,9 +188,9 @@ struct zebra_if /* Installed addresses chains tree. */ struct route_table *ipv4_subnets; -#ifdef RTADV +#if defined(HAVE_RTADV) struct rtadvconf rtadv; -#endif /* RTADV */ +#endif /* HAVE_RTADV */ #ifdef HAVE_IRDP struct irdp_interface irdp; |