update headers from 4.11-rc2

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

diff --git a/include/linux/if.h b/include/linux/if.h
index bf33a3e8d916b168856e1db2f988fad4fa2ee4a0..b4ba020791f8679ff124247ed387cfaf2085b2f9 100644 (file)
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -24,6 +24,8 @@
 #include <linux/socket.h>              /* for "struct sockaddr" et al  */
                /* for "__user" et al           */
 
+#include <sys/socket.h>                        /* for struct sockaddr.         */
+
 #if __UAPI_DEF_IF_IFNAMSIZ
 #define        IFNAMSIZ        16
 #endif /* __UAPI_DEF_IF_IFNAMSIZ */

diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index 6ff4a72163d63ac940880a58d024e6b6d9377bda..b7d3beb50ce2d81c6e1b411dfe6ac9893d4e279f 100644 (file)
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -93,6 +93,7 @@
 #define ETH_P_NCSI     0x88F8          /* NCSI protocol                */
 #define ETH_P_PRP      0x88FB          /* IEC 62439-3 PRP/HSRv0        */
 #define ETH_P_FCOE     0x8906          /* Fibre Channel over Ethernet  */
+#define ETH_P_IBOE     0x8915          /* Infiniband over Ethernet     */
 #define ETH_P_TDLS     0x890D          /* TDLS */
 #define ETH_P_FIP      0x8914          /* FCoE Initialization Protocol */
 #define ETH_P_80221    0x8917          /* IEEE 802.21 Media Independent Handover Protocol */

diff --git a/include/linux/ip6_tunnel.h b/include/linux/ip6_tunnel.h
index 48af63c9a48d25f5f6d9e2681e6eeeec5a4fef8c..425926c467d7ac8c30010e4aa3b6f664954d0ad1 100644 (file)
--- a/include/linux/ip6_tunnel.h
+++ b/include/linux/ip6_tunnel.h
@@ -2,6 +2,8 @@
 #define _IP6_TUNNEL_H
 
 #include <linux/types.h>
+#include <linux/if.h>          /* For IFNAMSIZ. */
+#include <linux/in6.h>         /* For struct in6_addr. */
 
 #define IPV6_TLV_TNL_ENCAP_LIMIT 4
 #define IPV6_DEFAULT_TNL_ENCAP_LIMIT 4

diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index d8bc1e626371d630288182fc57e04245f138b0ba..ff4a4a523c128c71baebecf77fd5dbf9b7e357c0 100644 (file)
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -3,7 +3,6 @@
 
 #include <linux/types.h>
 
-#include <linux/sysctl.h>
 #include <linux/in.h>
 #include <linux/in6.h>