From 776f1813b504b345708ad6720188de66f9ef2a16 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 8 Jun 2018 10:27:13 -0700 Subject: [PATCH] uapi: update headers from linux-net Signed-off-by: Stephen Hemminger --- include/uapi/linux/rtnetlink.h | 5 +++++ include/uapi/linux/types.h | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h index a501bc79..c3a7d8ec 100644 --- a/include/uapi/linux/rtnetlink.h +++ b/include/uapi/linux/rtnetlink.h @@ -254,6 +254,11 @@ enum { #define RTPROT_DHCP 16 /* DHCP client */ #define RTPROT_MROUTED 17 /* Multicast daemon */ #define RTPROT_BABEL 42 /* Babel daemon */ +#define RTPROT_BGP 186 /* BGP Routes */ +#define RTPROT_ISIS 187 /* ISIS Routes */ +#define RTPROT_OSPF 188 /* OSPF Routes */ +#define RTPROT_RIP 189 /* RIP Routes */ +#define RTPROT_EIGRP 192 /* EIGRP Routes */ /* rtm_scope diff --git a/include/uapi/linux/types.h b/include/uapi/linux/types.h index 5ea4daa7..999cb0fa 100644 --- a/include/uapi/linux/types.h +++ b/include/uapi/linux/types.h @@ -44,11 +44,7 @@ typedef __u32 __bitwise __wsum; #define __aligned_be64 __be64 __attribute__((aligned(8))) #define __aligned_le64 __le64 __attribute__((aligned(8))) -#ifdef __CHECK_POLL typedef unsigned __bitwise __poll_t; -#else -typedef unsigned __poll_t; -#endif #endif /* __ASSEMBLY__ */ #endif /* _LINUX_TYPES_H */