From 135e89e0498b5249efb857a143133c497024254c Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sat, 25 Apr 2015 17:37:46 +0000
Subject: [PATCH] Fix includes for musl libc

---
 bridge/fdb.c               | 1 -
 bridge/link.c              | 2 +-
 bridge/mdb.c               | 1 -
 bridge/vlan.c              | 1 -
 include/linux/if_bridge.h  | 4 ++--
 include/linux/if_tunnel.h  | 4 ++--
 include/linux/ip6_tunnel.h | 2 --
 include/linux/l2tp.h       | 2 --
 include/linux/seg6.h       | 1 -
 include/linux/xfrm.h       | 1 -
 ip/ip6tunnel.c             | 3 +--
 ip/ipaddress.c             | 4 ++--
 ip/ipl2tp.c                | 2 --
 ip/ipmaddr.c               | 4 +---
 ip/ipmroute.c              | 3 ---
 ip/iprule.c                | 2 +-
 ip/ipseg6.c                | 1 -
 ip/iptoken.c               | 2 +-
 ip/iptuntap.c              | 2 +-
 ip/link_gre.c              | 1 -
 ip/link_iptnl.c            | 1 -
 ip/tcp_metrics.c           | 1 -
 ip/tunnel.c                | 1 -
 ip/xfrm.h                  | 1 -
 lib/ll_addr.c              | 3 +--
 lib/ll_proto.c             | 3 +--
 lib/ll_types.c             | 3 +--
 lib/utils.c                | 2 +-
 misc/ss.c                  | 1 -
 29 files changed, 16 insertions(+), 43 deletions(-)

diff --git a/bridge/fdb.c b/bridge/fdb.c
index e5cebf9b..0710af8b 100644
--- a/bridge/fdb.c
+++ b/bridge/fdb.c
@@ -17,7 +17,6 @@
 #include <net/if.h>
 #include <netinet/in.h>
 #include <linux/if_bridge.h>
-#include <linux/if_ether.h>
 #include <linux/neighbour.h>
 #include <string.h>
 #include <limits.h>
diff --git a/bridge/link.c b/bridge/link.c
index 93472ad3..ec2f67f2 100644
--- a/bridge/link.c
+++ b/bridge/link.c
@@ -6,7 +6,7 @@
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <netinet/in.h>
-#include <linux/if.h>
+#include <net/if.h>
 #include <linux/if_bridge.h>
 #include <string.h>
 #include <stdbool.h>
diff --git a/bridge/mdb.c b/bridge/mdb.c
index e60ff3ef..540f6736 100644
--- a/bridge/mdb.c
+++ b/bridge/mdb.c
@@ -10,7 +10,6 @@
 #include <net/if.h>
 #include <netinet/in.h>
 #include <linux/if_bridge.h>
-#include <linux/if_ether.h>
 #include <string.h>
 #include <arpa/inet.h>
 
diff --git a/bridge/vlan.c b/bridge/vlan.c
index ebcdacee..12c642f4 100644
--- a/bridge/vlan.c
+++ b/bridge/vlan.c
@@ -6,7 +6,6 @@
 #include <net/if.h>
 #include <netinet/in.h>
 #include <linux/if_bridge.h>
-#include <linux/if_ether.h>
 #include <json_writer.h>
 #include <string.h>
 
diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
index 156f4434..de3b34ba 100644
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
@@ -13,9 +13,9 @@
 #ifndef _LINUX_IF_BRIDGE_H
 #define _LINUX_IF_BRIDGE_H
 
+#include <netinet/if_ether.h>
+
 #include <linux/types.h>
-#include <linux/if_ether.h>
-#include <linux/in6.h>
 
 #define SYSFS_BRIDGE_ATTR	"bridge"
 #define SYSFS_BRIDGE_FDB	"brforward"
diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index 7375335a..b92e0504 100644
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
@@ -1,10 +1,10 @@
 #ifndef _IF_TUNNEL_H_
 #define _IF_TUNNEL_H_
 
+#include <net/if.h>
+
 #include <linux/types.h>
-#include <linux/if.h>
 #include <linux/ip.h>
-#include <linux/in6.h>
 #include <asm/byteorder.h>
 
 
diff --git a/include/linux/ip6_tunnel.h b/include/linux/ip6_tunnel.h
index 425926c4..48af63c9 100644
--- a/include/linux/ip6_tunnel.h
+++ b/include/linux/ip6_tunnel.h
@@ -2,8 +2,6 @@
 #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/l2tp.h b/include/linux/l2tp.h
index 8a80007b..c1c85461 100644
--- a/include/linux/l2tp.h
+++ b/include/linux/l2tp.h
@@ -9,8 +9,6 @@
 
 #include <linux/types.h>
 #include <linux/socket.h>
-#include <linux/in.h>
-#include <linux/in6.h>
 
 #define IPPROTO_L2TP		115
 
diff --git a/include/linux/seg6.h b/include/linux/seg6.h
index 07152792..7278806f 100644
--- a/include/linux/seg6.h
+++ b/include/linux/seg6.h
@@ -15,7 +15,6 @@
 #define _LINUX_SEG6_H
 
 #include <linux/types.h>
-#include <linux/in6.h>		/* For struct in6_addr. */
 
 /*
  * SRH
diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
index 3af99e02..2e922959 100644
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h
@@ -1,7 +1,6 @@
 #ifndef _LINUX_XFRM_H
 #define _LINUX_XFRM_H
 
-#include <linux/in6.h>
 #include <linux/types.h>
 
 /* All of the structures in this file may not change size as they are
diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c
index b4a7def1..99c338bc 100644
--- a/ip/ip6tunnel.c
+++ b/ip/ip6tunnel.c
@@ -27,9 +27,8 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <sys/ioctl.h>
+#include <net/if_arp.h>
 #include <linux/ip.h>
-#include <linux/if.h>
-#include <linux/if_arp.h>
 #include <linux/if_tunnel.h>
 #include <linux/ip6_tunnel.h>
 
diff --git a/ip/ipaddress.c b/ip/ipaddress.c
index dbdd839c..bb9557b7 100644
--- a/ip/ipaddress.c
+++ b/ip/ipaddress.c
@@ -24,9 +24,9 @@
 #include <arpa/inet.h>
 #include <string.h>
 #include <fnmatch.h>
+#include <net/if.h>
+#include <netinet/if_ether.h>
 
-#include <linux/netdevice.h>
-#include <linux/if_arp.h>
 #include <linux/sockios.h>
 #include <linux/net_namespace.h>
 
diff --git a/ip/ipl2tp.c b/ip/ipl2tp.c
index 88664c90..1334320d 100644
--- a/ip/ipl2tp.c
+++ b/ip/ipl2tp.c
@@ -19,8 +19,6 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <sys/ioctl.h>
-#include <linux/if.h>
-#include <linux/if_arp.h>
 #include <linux/ip.h>
 
 #include <linux/genetlink.h>
diff --git a/ip/ipmaddr.c b/ip/ipmaddr.c
index 85a69e77..0c2b01a5 100644
--- a/ip/ipmaddr.c
+++ b/ip/ipmaddr.c
@@ -20,10 +20,8 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <string.h>
+#include <net/if.h>
 
-#include <linux/netdevice.h>
-#include <linux/if.h>
-#include <linux/if_arp.h>
 #include <linux/sockios.h>
 
 #include "rt_names.h"
diff --git a/ip/ipmroute.c b/ip/ipmroute.c
index b51c23cc..2f2a5a9a 100644
--- a/ip/ipmroute.c
+++ b/ip/ipmroute.c
@@ -22,9 +22,6 @@
 #include <arpa/inet.h>
 #include <string.h>
 
-#include <linux/netdevice.h>
-#include <linux/if.h>
-#include <linux/if_arp.h>
 #include <linux/sockios.h>
 
 #include <rt_names.h>
diff --git a/ip/iprule.c b/ip/iprule.c
index 8313138d..2ef0d8d9 100644
--- a/ip/iprule.c
+++ b/ip/iprule.c
@@ -20,7 +20,7 @@
 #include <netinet/ip.h>
 #include <arpa/inet.h>
 #include <string.h>
-#include <linux/if.h>
+#include <net/if.h>
 #include <linux/fib_rules.h>
 #include <errno.h>
 
diff --git a/ip/ipseg6.c b/ip/ipseg6.c
index a8f5c691..5c791a64 100644
--- a/ip/ipseg6.c
+++ b/ip/ipseg6.c
@@ -17,7 +17,6 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <sys/ioctl.h>
-#include <linux/if.h>
 
 #include <linux/genetlink.h>
 #include <linux/seg6_genl.h>
diff --git a/ip/iptoken.c b/ip/iptoken.c
index 1869f764..daf2dc66 100644
--- a/ip/iptoken.c
+++ b/ip/iptoken.c
@@ -21,7 +21,7 @@
 #include <netinet/ip.h>
 #include <arpa/inet.h>
 #include <linux/types.h>
-#include <linux/if.h>
+#include <net/if.h>
 
 #include "rt_names.h"
 #include "utils.h"
diff --git a/ip/iptuntap.c b/ip/iptuntap.c
index 451f7f0e..e79d2ca5 100644
--- a/ip/iptuntap.c
+++ b/ip/iptuntap.c
@@ -18,7 +18,7 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <sys/ioctl.h>
-#include <linux/if.h>
+#include <net/if.h>
 #include <linux/if_tun.h>
 #include <pwd.h>
 #include <grp.h>
diff --git a/ip/link_gre.c b/ip/link_gre.c
index c2ec5f26..acff5ad3 100644
--- a/ip/link_gre.c
+++ b/ip/link_gre.c
@@ -16,7 +16,6 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
 
-#include <linux/ip.h>
 #include <linux/if_tunnel.h>
 #include "rt_names.h"
 #include "utils.h"
diff --git a/ip/link_iptnl.c b/ip/link_iptnl.c
index d24e7376..2a3ebfd9 100644
--- a/ip/link_iptnl.c
+++ b/ip/link_iptnl.c
@@ -16,7 +16,6 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
 
-#include <linux/in.h>
 #include <linux/ip.h>
 #include <linux/if_tunnel.h>
 #include "rt_names.h"
diff --git a/ip/tcp_metrics.c b/ip/tcp_metrics.c
index 8972acd0..2f3706a1 100644
--- a/ip/tcp_metrics.c
+++ b/ip/tcp_metrics.c
@@ -17,7 +17,6 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <sys/ioctl.h>
-#include <linux/if.h>
 
 #include <linux/genetlink.h>
 #include <linux/tcp_metrics.h>
diff --git a/ip/tunnel.c b/ip/tunnel.c
index d359eb95..c95632ce 100644
--- a/ip/tunnel.c
+++ b/ip/tunnel.c
@@ -30,7 +30,6 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <netinet/in.h>
-#include <linux/if.h>
 #include <linux/ip.h>
 #include <linux/if_tunnel.h>
 
diff --git a/ip/xfrm.h b/ip/xfrm.h
index 54d80ce5..1fc0082b 100644
--- a/ip/xfrm.h
+++ b/ip/xfrm.h
@@ -26,7 +26,6 @@
 
 #include <stdio.h>
 #include <sys/socket.h>
-#include <linux/in.h>
 #include <linux/xfrm.h>
 #include <linux/ipsec.h>
 
diff --git a/lib/ll_addr.c b/lib/ll_addr.c
index 5b5caf3d..63ba255b 100644
--- a/lib/ll_addr.c
+++ b/lib/ll_addr.c
@@ -19,9 +19,8 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <string.h>
+#include <net/if_arp.h>
 
-#include <linux/netdevice.h>
-#include <linux/if_arp.h>
 #include <linux/sockios.h>
 
 #include "rt_names.h"
diff --git a/lib/ll_proto.c b/lib/ll_proto.c
index ef5a5b7b..63b14411 100644
--- a/lib/ll_proto.c
+++ b/lib/ll_proto.c
@@ -19,9 +19,8 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <string.h>
+#include <netinet/if_ether.h>
 
-#include <linux/netdevice.h>
-#include <linux/if_arp.h>
 #include <linux/sockios.h>
 
 #include "utils.h"
diff --git a/lib/ll_types.c b/lib/ll_types.c
index 8f294515..8edbbb7b 100644
--- a/lib/ll_types.c
+++ b/lib/ll_types.c
@@ -19,9 +19,8 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <string.h>
+#include <net/if_arp.h>
 
-#include <linux/netdevice.h>
-#include <linux/if_arp.h>
 #include <linux/sockios.h>
 
 #include "rt_names.h"
diff --git a/lib/utils.c b/lib/utils.c
index 330ab073..d2939c54 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -25,7 +25,7 @@
 #include <asm/types.h>
 #include <linux/pkt_sched.h>
 #include <linux/param.h>
-#include <linux/if_arp.h>
+#include <net/if_arp.h>
 #include <linux/mpls.h>
 #include <time.h>
 #include <sys/time.h>
diff --git a/misc/ss.c b/misc/ss.c
index dd8dfaa4..7938d1ae 100644
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -39,7 +39,6 @@
 #include <linux/sock_diag.h>
 #include <linux/inet_diag.h>
 #include <linux/unix_diag.h>
-#include <linux/netdevice.h>	/* for MAX_ADDR_LEN */
 #include <linux/filter.h>
 #include <linux/packet_diag.h>
 #include <linux/netlink_diag.h>
-- 
2.14.1