proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-03 05:43:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: remove HAVE_EVPN references

Browse Source 
This commit removes references to HAVE_EVPN references in lib folder.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
This commit is contained in:
Philippe Guibert 2017-01-25 08:48:42 +01:00
parent cbdc66c7c1
commit 0737aa5edb
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/prefix.c
View File

@ -304,12 +304,10 @@ prefix_copy (struct prefix *dest, const struct prefix *src)
dest->u.prefix4 = src->u.prefix4; dest->u.prefix4 = src->u.prefix4;
else if (src->family == AF_INET6) else if (src->family == AF_INET6)
dest->u.prefix6 = src->u.prefix6; dest->u.prefix6 = src->u.prefix6;
#if defined(HAVE_EVPN)
else if (src->family == AF_ETHERNET) else if (src->family == AF_ETHERNET)
{ {
memcpy (&dest->u.prefix_evpn, &src->u.prefix_evpn, sizeof (struct evpn_addr)); memcpy (&dest->u.prefix_evpn, &src->u.prefix_evpn, sizeof (struct evpn_addr));
} }
#endif /* (HAVE_EVPN) */
else if (src->family == AF_UNSPEC) else if (src->family == AF_UNSPEC)
{ {
dest->u.lp.id = src->u.lp.id; dest->u.lp.id = src->u.lp.id;
@ -348,11 +346,9 @@ prefix_same (const struct prefix *p1, const struct prefix *p2)
if (p1->family == AF_INET6 ) if (p1->family == AF_INET6 )
if (IPV6_ADDR_SAME (&p1->u.prefix6.s6_addr, &p2->u.prefix6.s6_addr)) if (IPV6_ADDR_SAME (&p1->u.prefix6.s6_addr, &p2->u.prefix6.s6_addr))
return 1; return 1;
#if defined(HAVE_EVPN)
if (p1->family == AF_ETHERNET ) if (p1->family == AF_ETHERNET )
if (!memcmp (&p1->u.prefix_evpn, &p2->u.prefix_evpn, sizeof (struct evpn_addr))) if (!memcmp (&p1->u.prefix_evpn, &p2->u.prefix_evpn, sizeof (struct evpn_addr)))
return 1; return 1;
#endif /* (HAVE_EVPN) */
} }
return 0; return 0;
} }
@ -873,7 +869,6 @@ prefix2str (union prefixconstptr pu, char *str, int size)
p->prefixlen); p->prefixlen);
break; break;
#if defined(HAVE_EVPN)
case AF_ETHERNET: case AF_ETHERNET:
if (p->u.prefix_evpn.route_type == 5) if (p->u.prefix_evpn.route_type == 5)
{ {
@ -888,7 +883,6 @@ prefix2str (union prefixconstptr pu, char *str, int size)
p->prefixlen); p->prefixlen);
} }
break; break;
#endif /* (HAVE_EVPN) */
default: default:
sprintf (str, "UNK prefix"); sprintf (str, "UNK prefix");
break; break;

2
lib/prefix.h
View File

@ -119,9 +119,7 @@ struct prefix
struct ethaddr prefix_eth; /* AF_ETHERNET */ struct ethaddr prefix_eth; /* AF_ETHERNET */
u_char val[8]; u_char val[8];
uintptr_t ptr; uintptr_t ptr;
#if defined(HAVE_EVPN)
struct evpn_addr prefix_evpn; struct evpn_addr prefix_evpn;
#endif
} u __attribute__ ((aligned (8))); } u __attribute__ ((aligned (8)));
}; };