1From 17a43a947323ea84d9ca633f488ca6eab8e3bfd8 Mon Sep 17 00:00:00 2001
  2From: Michael Forney <mforney@mforney.org>
  3Date: Sat, 25 Apr 2015 17:37:46 +0000
  4Subject: [PATCH] Fix includes for musl libc
  5
  6---
  7 bridge/fdb.c                    | 1 -
  8 bridge/mdb.c                    | 1 -
  9 bridge/vlan.c                   | 1 -
 10 include/uapi/linux/if_bridge.h  | 3 ++-
 11 include/uapi/linux/if_tunnel.h  | 3 ++-
 12 include/uapi/linux/ip6_tunnel.h | 3 ++-
 13 include/uapi/linux/netdevice.h  | 3 ++-
 14 ip/ip6tunnel.c                  | 2 +-
 15 ip/ipl2tp.c                     | 2 +-
 16 ip/iplink_hsr.c                 | 2 +-
 17 ip/ipmaddr.c                    | 2 +-
 18 ip/ipmroute.c                   | 2 +-
 19 ip/iptuntap.c                   | 1 -
 20 ip/tunnel.c                     | 2 +-
 21 14 files changed, 14 insertions(+), 14 deletions(-)
 22
 23diff --git a/bridge/fdb.c b/bridge/fdb.c
 24index 7b444366..17487c69 100644
 25--- a/bridge/fdb.c
 26+++ b/bridge/fdb.c
 27@@ -18,7 +18,6 @@
 28 #include <net/if.h>
 29 #include <netinet/in.h>
 30 #include <linux/if_bridge.h>
 31-#include <linux/if_ether.h>
 32 #include <linux/neighbour.h>
 33 #include <string.h>
 34 #include <limits.h>
 35diff --git a/bridge/mdb.c b/bridge/mdb.c
 36index 196363a5..ba499e49 100644
 37--- a/bridge/mdb.c
 38+++ b/bridge/mdb.c
 39@@ -11,7 +11,6 @@
 40 #include <net/if.h>
 41 #include <netinet/in.h>
 42 #include <linux/if_bridge.h>
 43-#include <linux/if_ether.h>
 44 #include <string.h>
 45 #include <arpa/inet.h>
 46 #include <netdb.h>
 47diff --git a/bridge/vlan.c b/bridge/vlan.c
 48index 5352eb24..a5035ab1 100644
 49--- a/bridge/vlan.c
 50+++ b/bridge/vlan.c
 51@@ -7,7 +7,6 @@
 52 #include <net/if.h>
 53 #include <netinet/in.h>
 54 #include <linux/if_bridge.h>
 55-#include <linux/if_ether.h>
 56 #include <string.h>
 57 #include <errno.h>
 58 
 59diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
 60index c206cf6d..5ba206b5 100644
 61--- a/include/uapi/linux/if_bridge.h
 62+++ b/include/uapi/linux/if_bridge.h
 63@@ -14,8 +14,9 @@
 64 #ifndef _LINUX_IF_BRIDGE_H
 65 #define _LINUX_IF_BRIDGE_H
 66 
 67+#include <netinet/if_ether.h>
 68+
 69 #include <linux/types.h>
 70-#include <linux/if_ether.h>
 71 #include <linux/in6.h>
 72 
 73 #define SYSFS_BRIDGE_ATTR	"bridge"
 74diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h
 75index edaea41c..d28d9d12 100644
 76--- a/include/uapi/linux/if_tunnel.h
 77+++ b/include/uapi/linux/if_tunnel.h
 78@@ -2,8 +2,9 @@
 79 #ifndef _IF_TUNNEL_H_
 80 #define _IF_TUNNEL_H_
 81 
 82+#include <net/if.h>
 83+
 84 #include <linux/types.h>
 85-#include <linux/if.h>
 86 #include <linux/ip.h>
 87 #include <linux/in6.h>
 88 #include <asm/byteorder.h>
 89diff --git a/include/uapi/linux/ip6_tunnel.h b/include/uapi/linux/ip6_tunnel.h
 90index 0245269b..08c23180 100644
 91--- a/include/uapi/linux/ip6_tunnel.h
 92+++ b/include/uapi/linux/ip6_tunnel.h
 93@@ -2,8 +2,9 @@
 94 #ifndef _IP6_TUNNEL_H
 95 #define _IP6_TUNNEL_H
 96 
 97+#include <net/if.h>		/* For IFNAMSIZ. */
 98+
 99 #include <linux/types.h>
100-#include <linux/if.h>		/* For IFNAMSIZ. */
101 #include <linux/in6.h>		/* For struct in6_addr. */
102 
103 #define IPV6_TLV_TNL_ENCAP_LIMIT 4
104diff --git a/include/uapi/linux/netdevice.h b/include/uapi/linux/netdevice.h
105index 86d961c9..cbe835e4 100644
106--- a/include/uapi/linux/netdevice.h
107+++ b/include/uapi/linux/netdevice.h
108@@ -26,7 +26,8 @@
109 #ifndef _LINUX_NETDEVICE_H
110 #define _LINUX_NETDEVICE_H
111 
112-#include <linux/if.h>
113+#include <net/if.h>
114+
115 #include <linux/if_ether.h>
116 #include <linux/if_packet.h>
117 #include <linux/if_link.h>
118diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c
119index 347bd46a..5e55e3ea 100644
120--- a/ip/ip6tunnel.c
121+++ b/ip/ip6tunnel.c
122@@ -14,8 +14,8 @@
123 #include <sys/socket.h>
124 #include <arpa/inet.h>
125 #include <sys/ioctl.h>
126+#include <net/if.h>
127 #include <linux/ip.h>
128-#include <linux/if.h>
129 #include <linux/if_arp.h>
130 #include <linux/if_tunnel.h>
131 #include <linux/ip6_tunnel.h>
132diff --git a/ip/ipl2tp.c b/ip/ipl2tp.c
133index 87a4b898..9d1e566c 100644
134--- a/ip/ipl2tp.c
135+++ b/ip/ipl2tp.c
136@@ -14,7 +14,7 @@
137 #include <sys/socket.h>
138 #include <arpa/inet.h>
139 #include <sys/ioctl.h>
140-#include <linux/if.h>
141+#include <net/if.h>
142 #include <linux/if_arp.h>
143 #include <linux/ip.h>
144 
145diff --git a/ip/iplink_hsr.c b/ip/iplink_hsr.c
146index 76f24a6a..599d487e 100644
147--- a/ip/iplink_hsr.c
148+++ b/ip/iplink_hsr.c
149@@ -11,7 +11,7 @@
150 #include <stdlib.h>
151 #include <string.h>
152 #include <sys/socket.h>  /* Needed by linux/if.h for some reason */
153-#include <linux/if.h>
154+#include <net/if.h>
155 #include <linux/if_arp.h>
156 #include "rt_names.h"
157 #include "utils.h"
158diff --git a/ip/ipmaddr.c b/ip/ipmaddr.c
159index 2418b303..3e7afa91 100644
160--- a/ip/ipmaddr.c
161+++ b/ip/ipmaddr.c
162@@ -14,9 +14,9 @@
163 #include <netinet/in.h>
164 #include <arpa/inet.h>
165 #include <string.h>
166+#include <net/if.h>
167 
168 #include <linux/netdevice.h>
169-#include <linux/if.h>
170 #include <linux/if_arp.h>
171 #include <linux/sockios.h>
172 
173diff --git a/ip/ipmroute.c b/ip/ipmroute.c
174index b6d9e618..33e66fc8 100644
175--- a/ip/ipmroute.c
176+++ b/ip/ipmroute.c
177@@ -15,9 +15,9 @@
178 #include <netinet/in.h>
179 #include <arpa/inet.h>
180 #include <string.h>
181+#include <net/if.h>
182 
183 #include <linux/netdevice.h>
184-#include <linux/if.h>
185 #include <linux/if_arp.h>
186 #include <linux/sockios.h>
187 
188diff --git a/ip/iptuntap.c b/ip/iptuntap.c
189index b7018a6f..0b63f53d 100644
190--- a/ip/iptuntap.c
191+++ b/ip/iptuntap.c
192@@ -13,7 +13,6 @@
193 #include <sys/socket.h>
194 #include <arpa/inet.h>
195 #include <sys/ioctl.h>
196-#include <linux/if.h>
197 #include <linux/if_tun.h>
198 #include <linux/if_arp.h>
199 #include <pwd.h>
200diff --git a/ip/tunnel.c b/ip/tunnel.c
201index c5c7a31f..e7b2ffab 100644
202--- a/ip/tunnel.c
203+++ b/ip/tunnel.c
204@@ -16,7 +16,7 @@
205 #include <sys/socket.h>
206 #include <sys/ioctl.h>
207 #include <netinet/in.h>
208-#include <linux/if.h>
209+#include <net/if.h>
210 #include <linux/ip.h>
211 #include <linux/if_tunnel.h>
212 #include <linux/if_arp.h>
213-- 
2142.44.0
215