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 a501bc79c2e4f98503a358f22acc2cfc494e87f4..c3a7d8ecc7b97a9a6eaf868cba54debb00318d08 100644 (file)
--- 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 5ea4daa7a020dbaa5df80cf720dd555f96fc0545..999cb0fa88ebdf0a3c9503b43eb2605cd9c487aa 100644 (file)
--- 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 */