1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
|
From fd0745e3e85d892520ca9d7ba42bb2603c969900 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/mdb.c | 1 -
bridge/vlan.c | 1 -
include/uapi/linux/if_bridge.h | 3 ++-
include/uapi/linux/if_tunnel.h | 3 ++-
include/uapi/linux/ip6_tunnel.h | 3 ++-
include/uapi/linux/netdevice.h | 3 ++-
ip/ip6tunnel.c | 2 +-
ip/ipl2tp.c | 2 +-
ip/iplink_hsr.c | 2 +-
ip/ipmaddr.c | 2 +-
ip/ipmroute.c | 2 +-
ip/iptuntap.c | 1 -
ip/tunnel.c | 2 +-
14 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/bridge/fdb.c b/bridge/fdb.c
index 8912f092..78f69cec 100644
--- a/bridge/fdb.c
+++ b/bridge/fdb.c
@@ -18,7 +18,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/mdb.c b/bridge/mdb.c
index 7b5863d3..e62bfce3 100644
--- a/bridge/mdb.c
+++ b/bridge/mdb.c
@@ -11,7 +11,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 8300f353..793d95d1 100644
--- a/bridge/vlan.c
+++ b/bridge/vlan.c
@@ -7,7 +7,6 @@
#include <net/if.h>
#include <netinet/in.h>
#include <linux/if_bridge.h>
-#include <linux/if_ether.h>
#include <string.h>
#include <errno.h>
diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
index d1b5fdee..b5a9217d 100644
--- a/include/uapi/linux/if_bridge.h
+++ b/include/uapi/linux/if_bridge.h
@@ -14,8 +14,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"
diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h
index c7f0a5e6..4cfcf216 100644
--- a/include/uapi/linux/if_tunnel.h
+++ b/include/uapi/linux/if_tunnel.h
@@ -2,8 +2,9 @@
#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/uapi/linux/ip6_tunnel.h b/include/uapi/linux/ip6_tunnel.h
index 0245269b..08c23180 100644
--- a/include/uapi/linux/ip6_tunnel.h
+++ b/include/uapi/linux/ip6_tunnel.h
@@ -2,8 +2,9 @@
#ifndef _IP6_TUNNEL_H
#define _IP6_TUNNEL_H
+#include <net/if.h> /* For IFNAMSIZ. */
+
#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
diff --git a/include/uapi/linux/netdevice.h b/include/uapi/linux/netdevice.h
index 86d961c9..cbe835e4 100644
--- a/include/uapi/linux/netdevice.h
+++ b/include/uapi/linux/netdevice.h
@@ -26,7 +26,8 @@
#ifndef _LINUX_NETDEVICE_H
#define _LINUX_NETDEVICE_H
-#include <linux/if.h>
+#include <net/if.h>
+
#include <linux/if_ether.h>
#include <linux/if_packet.h>
#include <linux/if_link.h>
diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c
index 5399f91d..c712d664 100644
--- a/ip/ip6tunnel.c
+++ b/ip/ip6tunnel.c
@@ -27,8 +27,8 @@
#include <sys/socket.h>
#include <arpa/inet.h>
#include <sys/ioctl.h>
+#include <net/if.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/ipl2tp.c b/ip/ipl2tp.c
index 77bc3249..f090390f 100644
--- a/ip/ipl2tp.c
+++ b/ip/ipl2tp.c
@@ -19,7 +19,7 @@
#include <sys/socket.h>
#include <arpa/inet.h>
#include <sys/ioctl.h>
-#include <linux/if.h>
+#include <net/if.h>
#include <linux/if_arp.h>
#include <linux/ip.h>
diff --git a/ip/iplink_hsr.c b/ip/iplink_hsr.c
index da2d03d4..8c63293a 100644
--- a/ip/iplink_hsr.c
+++ b/ip/iplink_hsr.c
@@ -15,7 +15,7 @@
#include <stdlib.h>
#include <string.h>
#include <sys/socket.h> /* Needed by linux/if.h for some reason */
-#include <linux/if.h>
+#include <net/if.h>
#include <linux/if_arp.h>
#include "rt_names.h"
#include "utils.h"
diff --git a/ip/ipmaddr.c b/ip/ipmaddr.c
index d41ac63a..b7600424 100644
--- a/ip/ipmaddr.c
+++ b/ip/ipmaddr.c
@@ -19,9 +19,9 @@
#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>
diff --git a/ip/ipmroute.c b/ip/ipmroute.c
index 981baf2a..2dfa83f8 100644
--- a/ip/ipmroute.c
+++ b/ip/ipmroute.c
@@ -20,9 +20,9 @@
#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>
diff --git a/ip/iptuntap.c b/ip/iptuntap.c
index 385d2bd8..9837b37e 100644
--- a/ip/iptuntap.c
+++ b/ip/iptuntap.c
@@ -18,7 +18,6 @@
#include <sys/socket.h>
#include <arpa/inet.h>
#include <sys/ioctl.h>
-#include <linux/if.h>
#include <linux/if_tun.h>
#include <linux/if_arp.h>
#include <pwd.h>
diff --git a/ip/tunnel.c b/ip/tunnel.c
index 88585cf3..f77ecde7 100644
--- a/ip/tunnel.c
+++ b/ip/tunnel.c
@@ -30,7 +30,7 @@
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <netinet/in.h>
-#include <linux/if.h>
+#include <net/if.h>
#include <linux/ip.h>
#include <linux/if_tunnel.h>
#include <linux/if_arp.h>
--
2.34.1
|
