From: Stephen Hemminger <stephen@networkplumber.org>
Date: Fri, 8 Jun 2018 17:27:13 +0000 (-0700)
Subject: uapi: update headers from linux-net
X-Git-Tag: v4.18.0~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=776f1813b504b345708ad6720188de66f9ef2a16;p=thirdparty%2Fiproute2.git

uapi: update headers from linux-net

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---

diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
index a501bc79c..c3a7d8ecc 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 5ea4daa7a..999cb0fa8 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 */