diff options
| author | vivek <vivek@cumulusnetworks.com> | 2015-11-20 08:51:48 -0800 |
|---|---|---|
| committer | vivek <vivek@cumulusnetworks.com> | 2015-11-20 08:51:48 -0800 |
| commit | 922705ecdccad98dcb5eb8dcb37394ec339afe51 (patch) | |
| tree | b2db1f62de86768be5edc4658bff5f345282cc89 /zebra/rib.h | |
| parent | 41ec92223a7dfc14eb8cb0b84c73ad09943213eb (diff) | |
| parent | 8afc891ac75f2b1f17d9190ef8de5378ec55fcd5 (diff) | |
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
Diffstat (limited to 'zebra/rib.h')
| -rw-r--r-- | zebra/rib.h | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/zebra/rib.h b/zebra/rib.h index 3656646c9b..1f045310a5 100644 --- a/zebra/rib.h +++ b/zebra/rib.h @@ -259,16 +259,7 @@ struct static_route : ((tnexthop) = (nexthop)->next)) \ : (((recursing) = 0),((tnexthop) = (tnexthop)->next))) -/* 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 - -#if defined (RTADV) +#if defined (HAVE_RTADV) /* Structure which hold status of router advertisement. */ struct rtadv { @@ -280,7 +271,7 @@ struct rtadv struct thread *ra_read; struct thread *ra_timer; }; -#endif /* RTADV */ +#endif /* HAVE_RTADV */ #ifdef HAVE_NETLINK /* Socket interface to kernel */ @@ -338,9 +329,9 @@ struct zebra_vrf struct list *rid_lo_sorted_list; struct prefix rid_user_assigned; -#if defined (RTADV) +#if defined (HAVE_RTADV) struct rtadv rtadv; -#endif /* RTADV */ +#endif /* HAVE_RTADV */ }; /* |