From: Stephen Hemminger <stephen@networkplumber.org>
Date: Mon, 13 Mar 2017 15:30:39 +0000 (-0700)
Subject: update headers from 4.11-rc2
X-Git-Tag: v4.11.0~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4280cfa72b31a69e9ad1ead40bbcdc8ca9b3600;p=thirdparty%2Fiproute2.git

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 bf33a3e8d..b4ba02079 100644
--- 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 6ff4a7216..b7d3beb50 100644
--- 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 48af63c9a..425926c46 100644
--- 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 d8bc1e626..ff4a4a523 100644
--- 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>