Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 1 | From 4c2e932664ec67662f4a0306cca4a7cd82853bda 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] Adjust for musl headers |
| 5 | |
| 6 | Upstream-Status: Inappropriate [musl specific] |
| 7 | |
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 9 | --- |
| 10 | src/libsystemd-network/sd-dhcp6-client.c | 2 +- |
| 11 | src/network/netdev/bareudp.c | 2 +- |
| 12 | src/network/netdev/batadv.c | 2 +- |
| 13 | src/network/netdev/bond.c | 2 +- |
| 14 | src/network/netdev/bridge.c | 2 +- |
| 15 | src/network/netdev/dummy.c | 2 +- |
| 16 | src/network/netdev/geneve.c | 2 +- |
| 17 | src/network/netdev/ifb.c | 2 +- |
| 18 | src/network/netdev/ipoib.c | 2 +- |
| 19 | src/network/netdev/ipvlan.c | 2 +- |
| 20 | src/network/netdev/macsec.c | 2 +- |
| 21 | src/network/netdev/macvlan.c | 2 +- |
| 22 | src/network/netdev/netdev.c | 2 +- |
| 23 | src/network/netdev/netdevsim.c | 2 +- |
| 24 | src/network/netdev/nlmon.c | 2 +- |
| 25 | src/network/netdev/tunnel.c | 2 +- |
| 26 | src/network/netdev/vcan.c | 2 +- |
| 27 | src/network/netdev/veth.c | 2 +- |
| 28 | src/network/netdev/vlan.c | 2 +- |
| 29 | src/network/netdev/vrf.c | 2 +- |
| 30 | src/network/netdev/vxcan.c | 2 +- |
| 31 | src/network/netdev/vxlan.c | 2 +- |
| 32 | src/network/netdev/xfrm.c | 2 +- |
| 33 | src/network/networkd-bridge-mdb.c | 4 ++-- |
| 34 | src/network/networkd-dhcp-common.c | 3 ++- |
| 35 | src/network/networkd-dhcp-prefix-delegation.c | 4 ++-- |
| 36 | src/network/networkd-dhcp-server.c | 2 +- |
| 37 | src/network/networkd-dhcp4.c | 2 +- |
| 38 | src/network/networkd-link.c | 2 +- |
| 39 | src/network/networkd-route.c | 8 ++++---- |
| 40 | src/network/networkd-setlink.c | 2 +- |
| 41 | src/shared/linux/ethtool.h | 3 ++- |
| 42 | src/shared/netif-util.c | 2 +- |
| 43 | src/udev/udev-builtin-net_id.c | 2 +- |
| 44 | 34 files changed, 41 insertions(+), 39 deletions(-) |
| 45 | |
| 46 | --- a/src/libsystemd-network/sd-dhcp6-client.c |
| 47 | +++ b/src/libsystemd-network/sd-dhcp6-client.c |
| 48 | @@ -5,7 +5,7 @@ |
| 49 | |
| 50 | #include <errno.h> |
| 51 | #include <sys/ioctl.h> |
| 52 | -#include <linux/if_arp.h> |
| 53 | +//#include <linux/if_arp.h> |
| 54 | #include <linux/if_infiniband.h> |
| 55 | |
| 56 | #include "sd-dhcp6-client.h" |
| 57 | --- a/src/network/netdev/bareudp.c |
| 58 | +++ b/src/network/netdev/bareudp.c |
| 59 | @@ -2,7 +2,7 @@ |
| 60 | * Copyright © 2020 VMware, Inc. */ |
| 61 | |
| 62 | #include <netinet/in.h> |
| 63 | -#include <linux/if_arp.h> |
| 64 | +//#include <linux/if_arp.h> |
| 65 | |
| 66 | #include "bareudp.h" |
| 67 | #include "netlink-util.h" |
| 68 | --- a/src/network/netdev/batadv.c |
| 69 | +++ b/src/network/netdev/batadv.c |
| 70 | @@ -3,7 +3,7 @@ |
| 71 | #include <inttypes.h> |
| 72 | #include <netinet/in.h> |
| 73 | #include <linux/genetlink.h> |
| 74 | -#include <linux/if_arp.h> |
| 75 | +//#include <linux/if_arp.h> |
| 76 | |
| 77 | #include "batadv.h" |
| 78 | #include "fileio.h" |
| 79 | --- a/src/network/netdev/bond.c |
| 80 | +++ b/src/network/netdev/bond.c |
| 81 | @@ -1,7 +1,7 @@ |
| 82 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 83 | |
| 84 | #include <netinet/in.h> |
| 85 | -#include <linux/if_arp.h> |
| 86 | +//#include <linux/if_arp.h> |
| 87 | |
| 88 | #include "alloc-util.h" |
| 89 | #include "bond.h" |
| 90 | --- a/src/network/netdev/bridge.c |
| 91 | +++ b/src/network/netdev/bridge.c |
| 92 | @@ -2,7 +2,7 @@ |
| 93 | |
| 94 | #include <net/if.h> |
| 95 | #include <netinet/in.h> |
| 96 | -#include <linux/if_arp.h> |
| 97 | +//#include <linux/if_arp.h> |
| 98 | #include <linux/if_bridge.h> |
| 99 | |
| 100 | #include "bridge.h" |
| 101 | --- a/src/network/netdev/dummy.c |
| 102 | +++ b/src/network/netdev/dummy.c |
| 103 | @@ -1,6 +1,6 @@ |
| 104 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 105 | |
| 106 | -#include <linux/if_arp.h> |
| 107 | +//#include <linux/if_arp.h> |
| 108 | |
| 109 | #include "dummy.h" |
| 110 | |
| 111 | --- a/src/network/netdev/geneve.c |
| 112 | +++ b/src/network/netdev/geneve.c |
| 113 | @@ -2,7 +2,7 @@ |
| 114 | |
| 115 | #include <net/if.h> |
| 116 | #include <netinet/in.h> |
| 117 | -#include <linux/if_arp.h> |
| 118 | +//#include <linux/if_arp.h> |
| 119 | |
| 120 | #include "alloc-util.h" |
| 121 | #include "conf-parser.h" |
| 122 | --- a/src/network/netdev/ifb.c |
| 123 | +++ b/src/network/netdev/ifb.c |
| 124 | @@ -1,7 +1,7 @@ |
| 125 | /* SPDX-License-Identifier: LGPL-2.1-or-later |
| 126 | * Copyright © 2019 VMware, Inc. */ |
| 127 | |
| 128 | -#include <linux/if_arp.h> |
| 129 | +//#include <linux/if_arp.h> |
| 130 | |
| 131 | #include "ifb.h" |
| 132 | |
| 133 | --- a/src/network/netdev/ipoib.c |
| 134 | +++ b/src/network/netdev/ipoib.c |
| 135 | @@ -1,6 +1,6 @@ |
| 136 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 137 | |
| 138 | -#include <linux/if_arp.h> |
| 139 | +//#include <linux/if_arp.h> |
| 140 | #include <linux/if_link.h> |
| 141 | |
| 142 | #include "ipoib.h" |
| 143 | --- a/src/network/netdev/ipvlan.c |
| 144 | +++ b/src/network/netdev/ipvlan.c |
| 145 | @@ -2,7 +2,7 @@ |
| 146 | |
| 147 | #include <net/if.h> |
| 148 | #include <netinet/in.h> |
| 149 | -#include <linux/if_arp.h> |
| 150 | +//#include <linux/if_arp.h> |
| 151 | |
| 152 | #include "conf-parser.h" |
| 153 | #include "ipvlan.h" |
| 154 | --- a/src/network/netdev/macsec.c |
| 155 | +++ b/src/network/netdev/macsec.c |
| 156 | @@ -1,7 +1,7 @@ |
| 157 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 158 | |
| 159 | #include <netinet/in.h> |
| 160 | -#include <linux/if_arp.h> |
| 161 | +//#include <linux/if_arp.h> |
| 162 | #include <linux/if_ether.h> |
| 163 | #include <linux/if_macsec.h> |
| 164 | #include <linux/genetlink.h> |
| 165 | --- a/src/network/netdev/macvlan.c |
| 166 | +++ b/src/network/netdev/macvlan.c |
| 167 | @@ -2,7 +2,7 @@ |
| 168 | |
| 169 | #include <net/if.h> |
| 170 | #include <netinet/in.h> |
| 171 | -#include <linux/if_arp.h> |
| 172 | +//#include <linux/if_arp.h> |
| 173 | |
| 174 | #include "conf-parser.h" |
| 175 | #include "macvlan.h" |
| 176 | --- a/src/network/netdev/netdev.c |
| 177 | +++ b/src/network/netdev/netdev.c |
| 178 | @@ -2,7 +2,7 @@ |
| 179 | |
| 180 | #include <net/if.h> |
| 181 | #include <netinet/in.h> |
| 182 | -#include <linux/if_arp.h> |
| 183 | +//#include <linux/if_arp.h> |
| 184 | #include <unistd.h> |
| 185 | |
| 186 | #include "alloc-util.h" |
| 187 | --- a/src/network/netdev/netdevsim.c |
| 188 | +++ b/src/network/netdev/netdevsim.c |
| 189 | @@ -1,6 +1,6 @@ |
| 190 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 191 | |
| 192 | -#include <linux/if_arp.h> |
| 193 | +//#include <linux/if_arp.h> |
| 194 | |
| 195 | #include "netdevsim.h" |
| 196 | |
| 197 | --- a/src/network/netdev/nlmon.c |
| 198 | +++ b/src/network/netdev/nlmon.c |
| 199 | @@ -1,6 +1,6 @@ |
| 200 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 201 | |
| 202 | -#include <linux/if_arp.h> |
| 203 | +//#include <linux/if_arp.h> |
| 204 | |
| 205 | #include "nlmon.h" |
| 206 | |
| 207 | --- a/src/network/netdev/tunnel.c |
| 208 | +++ b/src/network/netdev/tunnel.c |
| 209 | @@ -2,7 +2,7 @@ |
| 210 | |
| 211 | #include <netinet/in.h> |
| 212 | #include <linux/fou.h> |
| 213 | -#include <linux/if_arp.h> |
| 214 | +//#include <linux/if_arp.h> |
| 215 | #include <linux/if_tunnel.h> |
| 216 | #include <linux/ip.h> |
| 217 | #include <linux/ip6_tunnel.h> |
| 218 | --- a/src/network/netdev/vcan.c |
| 219 | +++ b/src/network/netdev/vcan.c |
| 220 | @@ -1,6 +1,6 @@ |
| 221 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 222 | |
| 223 | -#include <linux/if_arp.h> |
| 224 | +//#include <linux/if_arp.h> |
| 225 | |
| 226 | #include "vcan.h" |
| 227 | |
| 228 | --- a/src/network/netdev/veth.c |
| 229 | +++ b/src/network/netdev/veth.c |
| 230 | @@ -3,7 +3,7 @@ |
| 231 | #include <errno.h> |
| 232 | #include <net/if.h> |
| 233 | #include <netinet/in.h> |
| 234 | -#include <linux/if_arp.h> |
| 235 | +//#include <linux/if_arp.h> |
| 236 | #include <linux/veth.h> |
| 237 | |
| 238 | #include "netlink-util.h" |
| 239 | --- a/src/network/netdev/vlan.c |
| 240 | +++ b/src/network/netdev/vlan.c |
| 241 | @@ -2,7 +2,7 @@ |
| 242 | |
| 243 | #include <errno.h> |
| 244 | #include <net/if.h> |
| 245 | -#include <linux/if_arp.h> |
| 246 | +//#include <linux/if_arp.h> |
| 247 | #include <linux/if_vlan.h> |
| 248 | |
| 249 | #include "parse-util.h" |
| 250 | --- a/src/network/netdev/vrf.c |
| 251 | +++ b/src/network/netdev/vrf.c |
| 252 | @@ -2,7 +2,7 @@ |
| 253 | |
| 254 | #include <net/if.h> |
| 255 | #include <netinet/in.h> |
| 256 | -#include <linux/if_arp.h> |
| 257 | +//#include <linux/if_arp.h> |
| 258 | |
| 259 | #include "vrf.h" |
| 260 | |
| 261 | --- a/src/network/netdev/vxcan.c |
| 262 | +++ b/src/network/netdev/vxcan.c |
| 263 | @@ -1,7 +1,7 @@ |
| 264 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 265 | |
| 266 | #include <linux/can/vxcan.h> |
| 267 | -#include <linux/if_arp.h> |
| 268 | +//#include <linux/if_arp.h> |
| 269 | |
| 270 | #include "vxcan.h" |
| 271 | |
| 272 | --- a/src/network/netdev/vxlan.c |
| 273 | +++ b/src/network/netdev/vxlan.c |
| 274 | @@ -2,7 +2,7 @@ |
| 275 | |
| 276 | #include <net/if.h> |
| 277 | #include <netinet/in.h> |
| 278 | -#include <linux/if_arp.h> |
| 279 | +//#include <linux/if_arp.h> |
| 280 | |
| 281 | #include "conf-parser.h" |
| 282 | #include "alloc-util.h" |
| 283 | --- a/src/network/netdev/xfrm.c |
| 284 | +++ b/src/network/netdev/xfrm.c |
| 285 | @@ -1,6 +1,6 @@ |
| 286 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 287 | |
| 288 | -#include <linux/if_arp.h> |
| 289 | +//#include <linux/if_arp.h> |
| 290 | |
| 291 | #include "missing_network.h" |
| 292 | #include "xfrm.h" |
| 293 | --- a/src/network/networkd-bridge-mdb.c |
| 294 | +++ b/src/network/networkd-bridge-mdb.c |
| 295 | @@ -1,7 +1,5 @@ |
| 296 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 297 | |
| 298 | -#include <net/if.h> |
| 299 | -#include <linux/if_bridge.h> |
| 300 | |
| 301 | #include "netlink-util.h" |
| 302 | #include "networkd-bridge-mdb.h" |
| 303 | @@ -11,6 +9,8 @@ |
| 304 | #include "networkd-queue.h" |
| 305 | #include "string-util.h" |
| 306 | #include "vlan-util.h" |
| 307 | +#include <net/if.h> |
| 308 | +#include <linux/if_bridge.h> |
| 309 | |
| 310 | #define STATIC_BRIDGE_MDB_ENTRIES_PER_NETWORK_MAX 1024U |
| 311 | |
| 312 | --- a/src/network/networkd-dhcp-common.c |
| 313 | +++ b/src/network/networkd-dhcp-common.c |
| 314 | @@ -1,7 +1,8 @@ |
| 315 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 316 | |
| 317 | #include <netinet/in.h> |
| 318 | -#include <linux/if_arp.h> |
| 319 | +//#include <linux/if_arp.h> |
| 320 | +#include <net/if.h> |
| 321 | |
| 322 | #include "bus-error.h" |
| 323 | #include "dhcp-identifier.h" |
| 324 | --- a/src/network/networkd-dhcp-prefix-delegation.c |
| 325 | +++ b/src/network/networkd-dhcp-prefix-delegation.c |
| 326 | @@ -1,7 +1,5 @@ |
| 327 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 328 | |
| 329 | -#include <linux/ipv6_route.h> |
| 330 | - |
| 331 | #include "sd-dhcp6-client.h" |
| 332 | |
| 333 | #include "hashmap.h" |
| 334 | @@ -21,6 +19,8 @@ |
| 335 | #include "strv.h" |
| 336 | #include "tunnel.h" |
| 337 | |
| 338 | +#include <linux/ipv6_route.h> |
| 339 | + |
| 340 | bool link_dhcp_pd_is_enabled(Link *link) { |
| 341 | assert(link); |
| 342 | |
| 343 | --- a/src/network/networkd-dhcp-server.c |
| 344 | +++ b/src/network/networkd-dhcp-server.c |
| 345 | @@ -1,7 +1,7 @@ |
| 346 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 347 | |
| 348 | #include <netinet/in.h> |
| 349 | -#include <linux/if_arp.h> |
| 350 | +//#include <linux/if_arp.h> |
| 351 | #include <linux/if.h> |
| 352 | |
| 353 | #include "sd-dhcp-server.h" |
| 354 | --- a/src/network/networkd-dhcp4.c |
| 355 | +++ b/src/network/networkd-dhcp4.c |
| 356 | @@ -3,7 +3,7 @@ |
| 357 | #include <netinet/in.h> |
| 358 | #include <netinet/ip.h> |
| 359 | #include <linux/if.h> |
| 360 | -#include <linux/if_arp.h> |
| 361 | +//#include <linux/if_arp.h> |
| 362 | |
| 363 | #include "alloc-util.h" |
| 364 | #include "dhcp-client-internal.h" |
| 365 | --- a/src/network/networkd-link.c |
| 366 | +++ b/src/network/networkd-link.c |
| 367 | @@ -3,7 +3,7 @@ |
| 368 | #include <net/if.h> |
| 369 | #include <netinet/in.h> |
| 370 | #include <linux/if.h> |
| 371 | -#include <linux/if_arp.h> |
| 372 | +//#include <linux/if_arp.h> |
| 373 | #include <linux/if_link.h> |
| 374 | #include <linux/netdevice.h> |
| 375 | #include <sys/socket.h> |
| 376 | --- a/src/network/networkd-route.c |
| 377 | +++ b/src/network/networkd-route.c |
| 378 | @@ -1,9 +1,5 @@ |
| 379 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 380 | |
| 381 | -#include <linux/icmpv6.h> |
| 382 | -#include <linux/ipv6_route.h> |
| 383 | -#include <linux/nexthop.h> |
| 384 | - |
| 385 | #include "alloc-util.h" |
| 386 | #include "event-util.h" |
| 387 | #include "netlink-util.h" |
| 388 | @@ -21,6 +17,10 @@ |
| 389 | #include "vrf.h" |
| 390 | #include "wireguard.h" |
| 391 | |
| 392 | +#include <linux/icmpv6.h> |
| 393 | +#include <linux/ipv6_route.h> |
| 394 | +#include <linux/nexthop.h> |
| 395 | + |
| 396 | int route_new(Route **ret) { |
| 397 | _cleanup_(route_freep) Route *route = NULL; |
| 398 | |
| 399 | --- a/src/network/networkd-setlink.c |
| 400 | +++ b/src/network/networkd-setlink.c |
| 401 | @@ -2,7 +2,7 @@ |
| 402 | |
| 403 | #include <netinet/in.h> |
| 404 | #include <linux/if.h> |
| 405 | -#include <linux/if_arp.h> |
| 406 | +//#include <linux/if_arp.h> |
| 407 | #include <linux/if_bridge.h> |
| 408 | |
| 409 | #include "missing_network.h" |
| 410 | --- a/src/shared/linux/ethtool.h |
| 411 | +++ b/src/shared/linux/ethtool.h |
| 412 | @@ -16,7 +16,8 @@ |
| 413 | |
| 414 | #include <linux/kernel.h> |
| 415 | #include <linux/types.h> |
| 416 | -#include <linux/if_ether.h> |
| 417 | +#include <netinet/if_ether.h> |
| 418 | +//#include <linux/if_ether.h> |
| 419 | |
| 420 | #ifndef __KERNEL__ |
| 421 | #include <limits.h> /* for INT_MAX */ |
| 422 | --- a/src/shared/netif-util.c |
| 423 | +++ b/src/shared/netif-util.c |
| 424 | @@ -1,6 +1,6 @@ |
| 425 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 426 | |
| 427 | -#include <linux/if_arp.h> |
| 428 | +//#include <linux/if_arp.h> |
| 429 | |
| 430 | #include "arphrd-util.h" |
| 431 | #include "device-util.h" |
| 432 | --- a/src/udev/udev-builtin-net_id.c |
| 433 | +++ b/src/udev/udev-builtin-net_id.c |
| 434 | @@ -18,7 +18,7 @@ |
| 435 | #include <stdarg.h> |
| 436 | #include <unistd.h> |
| 437 | #include <linux/if.h> |
| 438 | -#include <linux/if_arp.h> |
| 439 | +//#include <linux/if_arp.h> |
| 440 | #include <linux/netdevice.h> |
| 441 | #include <linux/pci_regs.h> |
| 442 | |
| 443 | --- a/src/network/netdev/wireguard.c |
| 444 | +++ b/src/network/netdev/wireguard.c |
| 445 | @@ -6,7 +6,7 @@ |
| 446 | #include <sys/ioctl.h> |
| 447 | #include <net/if.h> |
| 448 | #include <netinet/in.h> |
| 449 | -#include <linux/if_arp.h> |
| 450 | +//#include <linux/if_arp.h> |
| 451 | #include <linux/ipv6_route.h> |
| 452 | |
| 453 | #include "sd-resolve.h" |