diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch | 572 |
1 files changed, 572 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch b/meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch new file mode 100644 index 0000000000..4176522a1c --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch | |||
@@ -0,0 +1,572 @@ | |||
1 | From 3c094d443ca30f19114392fd8ef274af6eabc12d Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 21 Jan 2022 22:19:37 -0800 | ||
4 | Subject: [PATCH 17/22] Adjust for musl headers | ||
5 | |||
6 | Upstream-Status: Inappropriate [musl specific] | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | |||
10 | [Rebased for v255.1] | ||
11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
12 | --- | ||
13 | src/libsystemd-network/sd-dhcp6-client.c | 2 +- | ||
14 | src/network/netdev/bareudp.c | 2 +- | ||
15 | src/network/netdev/batadv.c | 2 +- | ||
16 | src/network/netdev/bond.c | 2 +- | ||
17 | src/network/netdev/bridge.c | 2 +- | ||
18 | src/network/netdev/dummy.c | 2 +- | ||
19 | src/network/netdev/geneve.c | 2 +- | ||
20 | src/network/netdev/ifb.c | 2 +- | ||
21 | src/network/netdev/ipoib.c | 2 +- | ||
22 | src/network/netdev/ipvlan.c | 2 +- | ||
23 | src/network/netdev/macsec.c | 2 +- | ||
24 | src/network/netdev/macvlan.c | 2 +- | ||
25 | src/network/netdev/netdev.c | 2 +- | ||
26 | src/network/netdev/netdevsim.c | 2 +- | ||
27 | src/network/netdev/nlmon.c | 2 +- | ||
28 | src/network/netdev/tunnel.c | 2 +- | ||
29 | src/network/netdev/vcan.c | 2 +- | ||
30 | src/network/netdev/veth.c | 2 +- | ||
31 | src/network/netdev/vlan.c | 2 +- | ||
32 | src/network/netdev/vrf.c | 2 +- | ||
33 | src/network/netdev/vxcan.c | 2 +- | ||
34 | src/network/netdev/vxlan.c | 2 +- | ||
35 | src/network/netdev/wireguard.c | 2 +- | ||
36 | src/network/netdev/xfrm.c | 2 +- | ||
37 | src/network/networkd-bridge-mdb.c | 4 ++-- | ||
38 | src/network/networkd-dhcp-common.c | 3 ++- | ||
39 | src/network/networkd-dhcp-prefix-delegation.c | 3 ++- | ||
40 | src/network/networkd-dhcp-server.c | 2 +- | ||
41 | src/network/networkd-dhcp4.c | 2 +- | ||
42 | src/network/networkd-ipv6ll.c | 2 +- | ||
43 | src/network/networkd-link.c | 2 +- | ||
44 | src/network/networkd-ndisc.c | 2 +- | ||
45 | src/network/networkd-route.c | 8 ++++---- | ||
46 | src/network/networkd-setlink.c | 2 +- | ||
47 | src/network/networkd-sysctl.c | 2 +- | ||
48 | src/shared/linux/ethtool.h | 3 ++- | ||
49 | src/shared/netif-util.c | 2 +- | ||
50 | src/udev/udev-builtin-net_id.c | 2 +- | ||
51 | 38 files changed, 45 insertions(+), 42 deletions(-) | ||
52 | |||
53 | diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c | ||
54 | index c20367dfc9..b8d4cd8c2a 100644 | ||
55 | --- a/src/libsystemd-network/sd-dhcp6-client.c | ||
56 | +++ b/src/libsystemd-network/sd-dhcp6-client.c | ||
57 | @@ -5,7 +5,7 @@ | ||
58 | |||
59 | #include <errno.h> | ||
60 | #include <sys/ioctl.h> | ||
61 | -#include <linux/if_arp.h> | ||
62 | +//#include <linux/if_arp.h> | ||
63 | #include <linux/if_infiniband.h> | ||
64 | |||
65 | #include "sd-dhcp6-client.h" | ||
66 | diff --git a/src/network/netdev/bareudp.c b/src/network/netdev/bareudp.c | ||
67 | index 1df886573b..c8b6714726 100644 | ||
68 | --- a/src/network/netdev/bareudp.c | ||
69 | +++ b/src/network/netdev/bareudp.c | ||
70 | @@ -2,7 +2,7 @@ | ||
71 | * Copyright © 2020 VMware, Inc. */ | ||
72 | |||
73 | #include <netinet/in.h> | ||
74 | -#include <linux/if_arp.h> | ||
75 | +//#include <linux/if_arp.h> | ||
76 | |||
77 | #include "bareudp.h" | ||
78 | #include "netlink-util.h" | ||
79 | diff --git a/src/network/netdev/batadv.c b/src/network/netdev/batadv.c | ||
80 | index 26da0231d4..2e8002af8c 100644 | ||
81 | --- a/src/network/netdev/batadv.c | ||
82 | +++ b/src/network/netdev/batadv.c | ||
83 | @@ -3,7 +3,7 @@ | ||
84 | #include <inttypes.h> | ||
85 | #include <netinet/in.h> | ||
86 | #include <linux/genetlink.h> | ||
87 | -#include <linux/if_arp.h> | ||
88 | +//#include <linux/if_arp.h> | ||
89 | |||
90 | #include "batadv.h" | ||
91 | #include "fileio.h" | ||
92 | diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c | ||
93 | index 4d75a0d6bf..985b3197e0 100644 | ||
94 | --- a/src/network/netdev/bond.c | ||
95 | +++ b/src/network/netdev/bond.c | ||
96 | @@ -1,7 +1,7 @@ | ||
97 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ | ||
98 | |||
99 | #include <netinet/in.h> | ||
100 | -#include <linux/if_arp.h> | ||
101 | +//#include <linux/if_arp.h> | ||
102 | |||
103 | #include "alloc-util.h" | ||
104 | #include "bond.h" | ||
105 | diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c | ||
106 | index 3e394edadf..f12f667687 100644 | ||
107 | --- a/src/network/netdev/bridge.c | ||
108 | +++ b/src/network/netdev/bridge.c | ||
109 | @@ -2,7 +2,7 @@ | ||
110 | |||
111 | #include <net/if.h> | ||
112 | #include <netinet/in.h> | ||
113 | -#include <linux/if_arp.h> | ||
114 | +//#include <linux/if_arp.h> | ||
115 | #include <linux/if_bridge.h> | ||
116 | |||
117 | #include "bridge.h" | ||
118 | diff --git a/src/network/netdev/dummy.c b/src/network/netdev/dummy.c | ||
119 | index 00df1d2787..77b506b422 100644 | ||
120 | --- a/src/network/netdev/dummy.c | ||
121 | +++ b/src/network/netdev/dummy.c | ||
122 | @@ -1,6 +1,6 @@ | ||
123 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ | ||
124 | |||
125 | -#include <linux/if_arp.h> | ||
126 | +//#include <linux/if_arp.h> | ||
127 | |||
128 | #include "dummy.h" | ||
129 | |||
130 | diff --git a/src/network/netdev/geneve.c b/src/network/netdev/geneve.c | ||
131 | index bc655ec7ff..a77e8e17e4 100644 | ||
132 | --- a/src/network/netdev/geneve.c | ||
133 | +++ b/src/network/netdev/geneve.c | ||
134 | @@ -2,7 +2,7 @@ | ||
135 | |||
136 | #include <net/if.h> | ||
137 | #include <netinet/in.h> | ||
138 | -#include <linux/if_arp.h> | ||
139 | +//#include <linux/if_arp.h> | ||
140 | |||
141 | #include "alloc-util.h" | ||
142 | #include "conf-parser.h" | ||
143 | diff --git a/src/network/netdev/ifb.c b/src/network/netdev/ifb.c | ||
144 | index d7ff44cb9e..e037629ae4 100644 | ||
145 | --- a/src/network/netdev/ifb.c | ||
146 | +++ b/src/network/netdev/ifb.c | ||
147 | @@ -1,7 +1,7 @@ | ||
148 | /* SPDX-License-Identifier: LGPL-2.1-or-later | ||
149 | * Copyright © 2019 VMware, Inc. */ | ||
150 | |||
151 | -#include <linux/if_arp.h> | ||
152 | +//#include <linux/if_arp.h> | ||
153 | |||
154 | #include "ifb.h" | ||
155 | |||
156 | diff --git a/src/network/netdev/ipoib.c b/src/network/netdev/ipoib.c | ||
157 | index d5fe299b7b..c9c8002eac 100644 | ||
158 | --- a/src/network/netdev/ipoib.c | ||
159 | +++ b/src/network/netdev/ipoib.c | ||
160 | @@ -1,6 +1,6 @@ | ||
161 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ | ||
162 | |||
163 | -#include <linux/if_arp.h> | ||
164 | +//#include <linux/if_arp.h> | ||
165 | #include <linux/if_link.h> | ||
166 | |||
167 | #include "ipoib.h" | ||
168 | diff --git a/src/network/netdev/ipvlan.c b/src/network/netdev/ipvlan.c | ||
169 | index 05d5d010f6..d440f49537 100644 | ||
170 | --- a/src/network/netdev/ipvlan.c | ||
171 | +++ b/src/network/netdev/ipvlan.c | ||
172 | @@ -2,7 +2,7 @@ | ||
173 | |||
174 | #include <net/if.h> | ||
175 | #include <netinet/in.h> | ||
176 | -#include <linux/if_arp.h> | ||
177 | +//#include <linux/if_arp.h> | ||
178 | |||
179 | #include "conf-parser.h" | ||
180 | #include "ipvlan.h" | ||
181 | diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c | ||
182 | index 17d6acefb6..679d0984f9 100644 | ||
183 | --- a/src/network/netdev/macsec.c | ||
184 | +++ b/src/network/netdev/macsec.c | ||
185 | @@ -1,7 +1,7 @@ | ||
186 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ | ||
187 | |||
188 | #include <netinet/in.h> | ||
189 | -#include <linux/if_arp.h> | ||
190 | +//#include <linux/if_arp.h> | ||
191 | #include <linux/if_ether.h> | ||
192 | #include <linux/if_macsec.h> | ||
193 | #include <linux/genetlink.h> | ||
194 | diff --git a/src/network/netdev/macvlan.c b/src/network/netdev/macvlan.c | ||
195 | index 203807e3a5..8ab09a387e 100644 | ||
196 | --- a/src/network/netdev/macvlan.c | ||
197 | +++ b/src/network/netdev/macvlan.c | ||
198 | @@ -2,7 +2,7 @@ | ||
199 | |||
200 | #include <net/if.h> | ||
201 | #include <netinet/in.h> | ||
202 | -#include <linux/if_arp.h> | ||
203 | +//#include <linux/if_arp.h> | ||
204 | |||
205 | #include "conf-parser.h" | ||
206 | #include "macvlan.h" | ||
207 | diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c | ||
208 | index 57127a861a..7f787d0b9f 100644 | ||
209 | --- a/src/network/netdev/netdev.c | ||
210 | +++ b/src/network/netdev/netdev.c | ||
211 | @@ -2,7 +2,7 @@ | ||
212 | |||
213 | #include <net/if.h> | ||
214 | #include <netinet/in.h> | ||
215 | -#include <linux/if_arp.h> | ||
216 | +//#include <linux/if_arp.h> | ||
217 | #include <unistd.h> | ||
218 | |||
219 | #include "alloc-util.h" | ||
220 | diff --git a/src/network/netdev/netdevsim.c b/src/network/netdev/netdevsim.c | ||
221 | index 15d5c132f9..a3ffa48b15 100644 | ||
222 | --- a/src/network/netdev/netdevsim.c | ||
223 | +++ b/src/network/netdev/netdevsim.c | ||
224 | @@ -1,6 +1,6 @@ | ||
225 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ | ||
226 | |||
227 | -#include <linux/if_arp.h> | ||
228 | +//#include <linux/if_arp.h> | ||
229 | |||
230 | #include "netdevsim.h" | ||
231 | |||
232 | diff --git a/src/network/netdev/nlmon.c b/src/network/netdev/nlmon.c | ||
233 | index ff372092e6..eef66811f4 100644 | ||
234 | --- a/src/network/netdev/nlmon.c | ||
235 | +++ b/src/network/netdev/nlmon.c | ||
236 | @@ -1,6 +1,6 @@ | ||
237 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ | ||
238 | |||
239 | -#include <linux/if_arp.h> | ||
240 | +//#include <linux/if_arp.h> | ||
241 | |||
242 | #include "nlmon.h" | ||
243 | |||
244 | diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c | ||
245 | index db84e7cf6e..93d5642962 100644 | ||
246 | --- a/src/network/netdev/tunnel.c | ||
247 | +++ b/src/network/netdev/tunnel.c | ||
248 | @@ -2,7 +2,7 @@ | ||
249 | |||
250 | #include <netinet/in.h> | ||
251 | #include <linux/fou.h> | ||
252 | -#include <linux/if_arp.h> | ||
253 | +//#include <linux/if_arp.h> | ||
254 | #include <linux/if_tunnel.h> | ||
255 | #include <linux/ip.h> | ||
256 | #include <linux/ip6_tunnel.h> | ||
257 | diff --git a/src/network/netdev/vcan.c b/src/network/netdev/vcan.c | ||
258 | index 380547ee1e..137c1adf8a 100644 | ||
259 | --- a/src/network/netdev/vcan.c | ||
260 | +++ b/src/network/netdev/vcan.c | ||
261 | @@ -1,6 +1,6 @@ | ||
262 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ | ||
263 | |||
264 | -#include <linux/if_arp.h> | ||
265 | +//#include <linux/if_arp.h> | ||
266 | |||
267 | #include "vcan.h" | ||
268 | |||
269 | diff --git a/src/network/netdev/veth.c b/src/network/netdev/veth.c | ||
270 | index e0f5b4ebb1..8a424ed03d 100644 | ||
271 | --- a/src/network/netdev/veth.c | ||
272 | +++ b/src/network/netdev/veth.c | ||
273 | @@ -3,7 +3,7 @@ | ||
274 | #include <errno.h> | ||
275 | #include <net/if.h> | ||
276 | #include <netinet/in.h> | ||
277 | -#include <linux/if_arp.h> | ||
278 | +//#include <linux/if_arp.h> | ||
279 | #include <linux/veth.h> | ||
280 | |||
281 | #include "netlink-util.h" | ||
282 | diff --git a/src/network/netdev/vlan.c b/src/network/netdev/vlan.c | ||
283 | index 2390206993..efec630e30 100644 | ||
284 | --- a/src/network/netdev/vlan.c | ||
285 | +++ b/src/network/netdev/vlan.c | ||
286 | @@ -2,7 +2,7 @@ | ||
287 | |||
288 | #include <errno.h> | ||
289 | #include <net/if.h> | ||
290 | -#include <linux/if_arp.h> | ||
291 | +//#include <linux/if_arp.h> | ||
292 | #include <linux/if_vlan.h> | ||
293 | |||
294 | #include "parse-util.h" | ||
295 | diff --git a/src/network/netdev/vrf.c b/src/network/netdev/vrf.c | ||
296 | index b75ec2bcc6..6aeeea640b 100644 | ||
297 | --- a/src/network/netdev/vrf.c | ||
298 | +++ b/src/network/netdev/vrf.c | ||
299 | @@ -2,7 +2,7 @@ | ||
300 | |||
301 | #include <net/if.h> | ||
302 | #include <netinet/in.h> | ||
303 | -#include <linux/if_arp.h> | ||
304 | +//#include <linux/if_arp.h> | ||
305 | |||
306 | #include "vrf.h" | ||
307 | |||
308 | diff --git a/src/network/netdev/vxcan.c b/src/network/netdev/vxcan.c | ||
309 | index c0343f45b6..f9e718f40b 100644 | ||
310 | --- a/src/network/netdev/vxcan.c | ||
311 | +++ b/src/network/netdev/vxcan.c | ||
312 | @@ -1,7 +1,7 @@ | ||
313 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ | ||
314 | |||
315 | #include <linux/can/vxcan.h> | ||
316 | -#include <linux/if_arp.h> | ||
317 | +//#include <linux/if_arp.h> | ||
318 | |||
319 | #include "vxcan.h" | ||
320 | |||
321 | diff --git a/src/network/netdev/vxlan.c b/src/network/netdev/vxlan.c | ||
322 | index b11fdbbd0d..a971a917f0 100644 | ||
323 | --- a/src/network/netdev/vxlan.c | ||
324 | +++ b/src/network/netdev/vxlan.c | ||
325 | @@ -2,7 +2,7 @@ | ||
326 | |||
327 | #include <net/if.h> | ||
328 | #include <netinet/in.h> | ||
329 | -#include <linux/if_arp.h> | ||
330 | +//#include <linux/if_arp.h> | ||
331 | |||
332 | #include "conf-parser.h" | ||
333 | #include "alloc-util.h" | ||
334 | diff --git a/src/network/netdev/wireguard.c b/src/network/netdev/wireguard.c | ||
335 | index 4c7d837c41..6df6dfb816 100644 | ||
336 | --- a/src/network/netdev/wireguard.c | ||
337 | +++ b/src/network/netdev/wireguard.c | ||
338 | @@ -6,7 +6,7 @@ | ||
339 | #include <sys/ioctl.h> | ||
340 | #include <net/if.h> | ||
341 | #include <netinet/in.h> | ||
342 | -#include <linux/if_arp.h> | ||
343 | +//#include <linux/if_arp.h> | ||
344 | #include <linux/ipv6_route.h> | ||
345 | |||
346 | #include "sd-resolve.h" | ||
347 | diff --git a/src/network/netdev/xfrm.c b/src/network/netdev/xfrm.c | ||
348 | index 905bfc0bdf..39e34dbb3b 100644 | ||
349 | --- a/src/network/netdev/xfrm.c | ||
350 | +++ b/src/network/netdev/xfrm.c | ||
351 | @@ -1,6 +1,6 @@ | ||
352 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ | ||
353 | |||
354 | -#include <linux/if_arp.h> | ||
355 | +//#include <linux/if_arp.h> | ||
356 | |||
357 | #include "missing_network.h" | ||
358 | #include "xfrm.h" | ||
359 | diff --git a/src/network/networkd-bridge-mdb.c b/src/network/networkd-bridge-mdb.c | ||
360 | index bd1a9745dc..949d3da029 100644 | ||
361 | --- a/src/network/networkd-bridge-mdb.c | ||
362 | +++ b/src/network/networkd-bridge-mdb.c | ||
363 | @@ -1,7 +1,5 @@ | ||
364 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ | ||
365 | |||
366 | -#include <net/if.h> | ||
367 | -#include <linux/if_bridge.h> | ||
368 | |||
369 | #include "netlink-util.h" | ||
370 | #include "networkd-bridge-mdb.h" | ||
371 | @@ -11,6 +9,8 @@ | ||
372 | #include "networkd-queue.h" | ||
373 | #include "string-util.h" | ||
374 | #include "vlan-util.h" | ||
375 | +#include <net/if.h> | ||
376 | +#include <linux/if_bridge.h> | ||
377 | |||
378 | #define STATIC_BRIDGE_MDB_ENTRIES_PER_NETWORK_MAX 1024U | ||
379 | |||
380 | diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c | ||
381 | index 080b15387c..efe8283957 100644 | ||
382 | --- a/src/network/networkd-dhcp-common.c | ||
383 | +++ b/src/network/networkd-dhcp-common.c | ||
384 | @@ -1,7 +1,8 @@ | ||
385 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ | ||
386 | |||
387 | #include <netinet/in.h> | ||
388 | -#include <linux/if_arp.h> | ||
389 | +//#include <linux/if_arp.h> | ||
390 | +#include <net/if.h> | ||
391 | |||
392 | #include "bus-error.h" | ||
393 | #include "bus-locator.h" | ||
394 | diff --git a/src/network/networkd-dhcp-prefix-delegation.c b/src/network/networkd-dhcp-prefix-delegation.c | ||
395 | index af2fe9efcd..511565700f 100644 | ||
396 | --- a/src/network/networkd-dhcp-prefix-delegation.c | ||
397 | +++ b/src/network/networkd-dhcp-prefix-delegation.c | ||
398 | @@ -1,6 +1,5 @@ | ||
399 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ | ||
400 | |||
401 | -#include <linux/ipv6_route.h> | ||
402 | |||
403 | #include "dhcp6-lease-internal.h" | ||
404 | #include "hashmap.h" | ||
405 | @@ -20,6 +19,8 @@ | ||
406 | #include "strv.h" | ||
407 | #include "tunnel.h" | ||
408 | |||
409 | +#include <linux/ipv6_route.h> | ||
410 | + | ||
411 | bool link_dhcp_pd_is_enabled(Link *link) { | ||
412 | assert(link); | ||
413 | |||
414 | diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c | ||
415 | index 607fe0053c..9ce4005874 100644 | ||
416 | --- a/src/network/networkd-dhcp-server.c | ||
417 | +++ b/src/network/networkd-dhcp-server.c | ||
418 | @@ -1,7 +1,7 @@ | ||
419 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ | ||
420 | |||
421 | #include <netinet/in.h> | ||
422 | -#include <linux/if_arp.h> | ||
423 | +//#include <linux/if_arp.h> | ||
424 | #include <linux/if.h> | ||
425 | |||
426 | #include "sd-dhcp-server.h" | ||
427 | diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c | ||
428 | index efbae6d868..1ea2151d50 100644 | ||
429 | --- a/src/network/networkd-dhcp4.c | ||
430 | +++ b/src/network/networkd-dhcp4.c | ||
431 | @@ -3,7 +3,7 @@ | ||
432 | #include <netinet/in.h> | ||
433 | #include <netinet/ip.h> | ||
434 | #include <linux/if.h> | ||
435 | -#include <linux/if_arp.h> | ||
436 | +//#include <linux/if_arp.h> | ||
437 | |||
438 | #include "alloc-util.h" | ||
439 | #include "dhcp-client-internal.h" | ||
440 | diff --git a/src/network/networkd-ipv6ll.c b/src/network/networkd-ipv6ll.c | ||
441 | index 32229a3fc7..662a345d6e 100644 | ||
442 | --- a/src/network/networkd-ipv6ll.c | ||
443 | +++ b/src/network/networkd-ipv6ll.c | ||
444 | @@ -1,7 +1,7 @@ | ||
445 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ | ||
446 | |||
447 | #include <linux/if.h> | ||
448 | -#include <linux/if_arp.h> | ||
449 | +//#include <linux/if_arp.h> | ||
450 | |||
451 | #include "in-addr-util.h" | ||
452 | #include "networkd-address.h" | ||
453 | diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c | ||
454 | index ee5f0f2c0a..ea5269a2de 100644 | ||
455 | --- a/src/network/networkd-link.c | ||
456 | +++ b/src/network/networkd-link.c | ||
457 | @@ -3,7 +3,7 @@ | ||
458 | #include <net/if.h> | ||
459 | #include <netinet/in.h> | ||
460 | #include <linux/if.h> | ||
461 | -#include <linux/if_arp.h> | ||
462 | +//#include <linux/if_arp.h> | ||
463 | #include <linux/if_link.h> | ||
464 | #include <linux/netdevice.h> | ||
465 | #include <sys/socket.h> | ||
466 | diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c | ||
467 | index ab9eeb13a5..dd96fe7483 100644 | ||
468 | --- a/src/network/networkd-ndisc.c | ||
469 | +++ b/src/network/networkd-ndisc.c | ||
470 | @@ -6,7 +6,7 @@ | ||
471 | #include <arpa/inet.h> | ||
472 | #include <netinet/icmp6.h> | ||
473 | #include <linux/if.h> | ||
474 | -#include <linux/if_arp.h> | ||
475 | +//#include <linux/if_arp.h> | ||
476 | |||
477 | #include "sd-ndisc.h" | ||
478 | |||
479 | diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c | ||
480 | index 7218d799fc..30d5574eae 100644 | ||
481 | --- a/src/network/networkd-route.c | ||
482 | +++ b/src/network/networkd-route.c | ||
483 | @@ -1,9 +1,5 @@ | ||
484 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ | ||
485 | |||
486 | -#include <linux/icmpv6.h> | ||
487 | -#include <linux/ipv6_route.h> | ||
488 | -#include <linux/nexthop.h> | ||
489 | - | ||
490 | #include "alloc-util.h" | ||
491 | #include "event-util.h" | ||
492 | #include "netlink-util.h" | ||
493 | @@ -21,6 +17,10 @@ | ||
494 | #include "vrf.h" | ||
495 | #include "wireguard.h" | ||
496 | |||
497 | +#include <linux/icmpv6.h> | ||
498 | +#include <linux/ipv6_route.h> | ||
499 | +#include <linux/nexthop.h> | ||
500 | + | ||
501 | int route_new(Route **ret) { | ||
502 | _cleanup_(route_freep) Route *route = NULL; | ||
503 | |||
504 | diff --git a/src/network/networkd-setlink.c b/src/network/networkd-setlink.c | ||
505 | index 2298f9ea3a..7d5f87de53 100644 | ||
506 | --- a/src/network/networkd-setlink.c | ||
507 | +++ b/src/network/networkd-setlink.c | ||
508 | @@ -2,7 +2,7 @@ | ||
509 | |||
510 | #include <netinet/in.h> | ||
511 | #include <linux/if.h> | ||
512 | -#include <linux/if_arp.h> | ||
513 | +//#include <linux/if_arp.h> | ||
514 | #include <linux/if_bridge.h> | ||
515 | |||
516 | #include "missing_network.h" | ||
517 | diff --git a/src/network/networkd-sysctl.c b/src/network/networkd-sysctl.c | ||
518 | index 2b226b2e2a..f12a474e2f 100644 | ||
519 | --- a/src/network/networkd-sysctl.c | ||
520 | +++ b/src/network/networkd-sysctl.c | ||
521 | @@ -2,7 +2,7 @@ | ||
522 | |||
523 | #include <netinet/in.h> | ||
524 | #include <linux/if.h> | ||
525 | -#include <linux/if_arp.h> | ||
526 | +//#include <linux/if_arp.h> | ||
527 | |||
528 | #include "missing_network.h" | ||
529 | #include "networkd-link.h" | ||
530 | diff --git a/src/shared/linux/ethtool.h b/src/shared/linux/ethtool.h | ||
531 | index 3d1da515c0..3fca9a4faf 100644 | ||
532 | --- a/src/shared/linux/ethtool.h | ||
533 | +++ b/src/shared/linux/ethtool.h | ||
534 | @@ -16,7 +16,8 @@ | ||
535 | |||
536 | #include <linux/const.h> | ||
537 | #include <linux/types.h> | ||
538 | -#include <linux/if_ether.h> | ||
539 | +#include <netinet/if_ether.h> | ||
540 | +//#include <linux/if_ether.h> | ||
541 | |||
542 | #include <limits.h> /* for INT_MAX */ | ||
543 | |||
544 | diff --git a/src/shared/netif-util.c b/src/shared/netif-util.c | ||
545 | index f56c5646c1..5af28ff119 100644 | ||
546 | --- a/src/shared/netif-util.c | ||
547 | +++ b/src/shared/netif-util.c | ||
548 | @@ -1,7 +1,7 @@ | ||
549 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ | ||
550 | |||
551 | #include <linux/if.h> | ||
552 | -#include <linux/if_arp.h> | ||
553 | +//#include <linux/if_arp.h> | ||
554 | |||
555 | #include "arphrd-util.h" | ||
556 | #include "device-util.h" | ||
557 | diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c | ||
558 | index f528a46b8e..830318cda5 100644 | ||
559 | --- a/src/udev/udev-builtin-net_id.c | ||
560 | +++ b/src/udev/udev-builtin-net_id.c | ||
561 | @@ -18,7 +18,7 @@ | ||
562 | #include <stdarg.h> | ||
563 | #include <unistd.h> | ||
564 | #include <linux/if.h> | ||
565 | -#include <linux/if_arp.h> | ||
566 | +//#include <linux/if_arp.h> | ||
567 | #include <linux/netdevice.h> | ||
568 | #include <linux/pci_regs.h> | ||
569 | |||
570 | -- | ||
571 | 2.34.1 | ||
572 | |||