Merge pull request #7220 from idryzhov/fix-clear-isis

[mirror_frr.git] / lib / prefix.h

diff --git a/lib/prefix.h b/lib/prefix.h
index 400f07386f90ee4f2e5eb2efcc33189d19f181a7..471978ed28e61e0303ca33240c9397a2381481ee 100644 (file)
--- a/lib/prefix.h
+++ b/lib/prefix.h
@@ -22,15 +22,11 @@
 #ifndef _ZEBRA_PREFIX_H
 #define _ZEBRA_PREFIX_H
 
-#ifdef SUNOS_5
-#include <sys/ethernet.h>
-#else
 #ifdef GNU_LINUX
 #include <net/ethernet.h>
 #else
 #include <netinet/if_ether.h>
 #endif
-#endif
 #include "sockunion.h"
 #include "ipaddr.h"
 #include "compiler.h"
@@ -176,6 +172,7 @@ struct evpn_addr {
 #endif
 
 struct flowspec_prefix {
+       uint8_t family;
        uint16_t prefixlen; /* length in bytes */
        uintptr_t ptr;
 };
@@ -410,12 +407,7 @@ static inline void ipv4_addr_copy(struct in_addr *dst,
 
 /* glibc defines s6_addr32 to __in6_u.__u6_addr32 if __USE_{MISC || GNU} */
 #ifndef s6_addr32
-#if defined(SUNOS_5)
-/* Some SunOS define s6_addr32 only to kernel */
-#define s6_addr32 _S6_un._S6_u32
-#else
 #define s6_addr32 __u6_addr.__u6_addr32
-#endif /* SUNOS_5 */
 #endif /*s6_addr32*/
 
 /* Prototypes. */