These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / include / uapi / linux / in.h

diff --git a/kernel/include/uapi/linux/in.h b/kernel/include/uapi/linux/in.h
index 589ced0..eaf9491 100644 (file)
--- a/kernel/include/uapi/linux/in.h
+++ b/kernel/include/uapi/linux/in.h
@@ -19,8 +19,10 @@
 #define _UAPI_LINUX_IN_H
 
 #include <linux/types.h>
+#include <linux/libc-compat.h>
 #include <linux/socket.h>
 
+#if __UAPI_DEF_IN_IPPROTO
 /* Standard well-defined IP protocols.  */
 enum {
   IPPROTO_IP = 0,              /* Dummy protocol for TCP               */
@@ -69,16 +71,20 @@ enum {
 #define IPPROTO_SCTP           IPPROTO_SCTP
   IPPROTO_UDPLITE = 136,       /* UDP-Lite (RFC 3828)                  */
 #define IPPROTO_UDPLITE                IPPROTO_UDPLITE
+  IPPROTO_MPLS = 137,          /* MPLS in IP (RFC 4023)                */
+#define IPPROTO_MPLS           IPPROTO_MPLS
   IPPROTO_RAW = 255,           /* Raw IP packets                       */
 #define IPPROTO_RAW            IPPROTO_RAW
   IPPROTO_MAX
 };
+#endif
 
-
+#if __UAPI_DEF_IN_ADDR
 /* Internet address. */
 struct in_addr {
        __be32  s_addr;
 };
+#endif
 
 #define IP_TOS         1
 #define IP_TTL         2
@@ -110,6 +116,7 @@ struct in_addr {
 #define IP_MINTTL       21
 #define IP_NODEFRAG     22
 #define IP_CHECKSUM    23
+#define IP_BIND_ADDRESS_NO_PORT        24
 
 /* IP_MTU_DISCOVER values */
 #define IP_PMTUDISC_DONT               0       /* Never send DF frames */
@@ -155,6 +162,7 @@ struct in_addr {
 
 /* Request struct for multicast socket ops */
 
+#if __UAPI_DEF_IP_MREQ
 struct ip_mreq  {
        struct in_addr imr_multiaddr;   /* IP multicast address of group */
        struct in_addr imr_interface;   /* local IP address of interface */
@@ -206,14 +214,18 @@ struct group_filter {
 #define GROUP_FILTER_SIZE(numsrc) \
        (sizeof(struct group_filter) - sizeof(struct __kernel_sockaddr_storage) \
        + (numsrc) * sizeof(struct __kernel_sockaddr_storage))
+#endif
 
+#if __UAPI_DEF_IN_PKTINFO
 struct in_pktinfo {
        int             ipi_ifindex;
        struct in_addr  ipi_spec_dst;
        struct in_addr  ipi_addr;
 };
+#endif
 
 /* Structure describing an Internet (IP) socket address. */
+#if  __UAPI_DEF_SOCKADDR_IN
 #define __SOCK_SIZE__  16              /* sizeof(struct sockaddr)      */
 struct sockaddr_in {
   __kernel_sa_family_t sin_family;     /* Address family               */
@@ -225,8 +237,9 @@ struct sockaddr_in {
                        sizeof(unsigned short int) - sizeof(struct in_addr)];
 };
 #define sin_zero       __pad           /* for BSD UNIX comp. -FvK      */
+#endif
 
-
+#if __UAPI_DEF_IN_CLASS
 /*
  * Definitions of the bits in an Internet address integer.
  * On subnets, host and network parts are found according
@@ -277,7 +290,7 @@ struct sockaddr_in {
 #define INADDR_ALLHOSTS_GROUP  0xe0000001U     /* 224.0.0.1   */
 #define INADDR_ALLRTRS_GROUP    0xe0000002U    /* 224.0.0.2 */
 #define INADDR_MAX_LOCAL_GROUP  0xe00000ffU    /* 224.0.0.255 */
-
+#endif
 
 /* <asm/byteorder.h> contains the htonl type stuff.. */
 #include <asm/byteorder.h>