Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 1 | From 9a1841402ce3ef21a10a7314a07a615f8196d406 Mon Sep 17 00:00:00 2001 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 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> |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 9 | |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 10 | --- |
| 11 | src/libsystemd-network/sd-dhcp6-client.c | 2 +- |
| 12 | src/network/netdev/bareudp.c | 2 +- |
| 13 | src/network/netdev/batadv.c | 2 +- |
| 14 | src/network/netdev/bond.c | 2 +- |
| 15 | src/network/netdev/bridge.c | 2 +- |
| 16 | src/network/netdev/dummy.c | 2 +- |
| 17 | src/network/netdev/geneve.c | 2 +- |
| 18 | src/network/netdev/ifb.c | 2 +- |
| 19 | src/network/netdev/ipoib.c | 2 +- |
| 20 | src/network/netdev/ipvlan.c | 2 +- |
| 21 | src/network/netdev/macsec.c | 2 +- |
| 22 | src/network/netdev/macvlan.c | 2 +- |
| 23 | src/network/netdev/netdev.c | 2 +- |
| 24 | src/network/netdev/netdevsim.c | 2 +- |
| 25 | src/network/netdev/nlmon.c | 2 +- |
| 26 | src/network/netdev/tunnel.c | 2 +- |
| 27 | src/network/netdev/vcan.c | 2 +- |
| 28 | src/network/netdev/veth.c | 2 +- |
| 29 | src/network/netdev/vlan.c | 2 +- |
| 30 | src/network/netdev/vrf.c | 2 +- |
| 31 | src/network/netdev/vxcan.c | 2 +- |
| 32 | src/network/netdev/vxlan.c | 2 +- |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 33 | src/network/netdev/wireguard.c | 2 +- |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 34 | src/network/netdev/xfrm.c | 2 +- |
| 35 | src/network/networkd-bridge-mdb.c | 4 ++-- |
| 36 | src/network/networkd-dhcp-common.c | 3 ++- |
| 37 | src/network/networkd-dhcp-prefix-delegation.c | 4 ++-- |
| 38 | src/network/networkd-dhcp-server.c | 2 +- |
| 39 | src/network/networkd-dhcp4.c | 2 +- |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame^] | 40 | src/network/networkd-ipv6ll.c | 2 +- |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 41 | src/network/networkd-link.c | 2 +- |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame^] | 42 | src/network/networkd-ndisc.c | 2 +- |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 43 | src/network/networkd-route.c | 8 ++++---- |
| 44 | src/network/networkd-setlink.c | 2 +- |
| 45 | src/shared/linux/ethtool.h | 3 ++- |
| 46 | src/shared/netif-util.c | 2 +- |
| 47 | src/udev/udev-builtin-net_id.c | 2 +- |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame^] | 48 | 37 files changed, 44 insertions(+), 42 deletions(-) |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 49 | |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 50 | diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame^] | 51 | index b346a50d78..7884d4c1cd 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 52 | --- a/src/libsystemd-network/sd-dhcp6-client.c |
| 53 | +++ b/src/libsystemd-network/sd-dhcp6-client.c |
| 54 | @@ -5,7 +5,7 @@ |
| 55 | |
| 56 | #include <errno.h> |
| 57 | #include <sys/ioctl.h> |
| 58 | -#include <linux/if_arp.h> |
| 59 | +//#include <linux/if_arp.h> |
| 60 | #include <linux/if_infiniband.h> |
| 61 | |
| 62 | #include "sd-dhcp6-client.h" |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 63 | diff --git a/src/network/netdev/bareudp.c b/src/network/netdev/bareudp.c |
| 64 | index 8ff0eb1360..7e06b8d57d 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 65 | --- a/src/network/netdev/bareudp.c |
| 66 | +++ b/src/network/netdev/bareudp.c |
| 67 | @@ -2,7 +2,7 @@ |
| 68 | * Copyright © 2020 VMware, Inc. */ |
| 69 | |
| 70 | #include <netinet/in.h> |
| 71 | -#include <linux/if_arp.h> |
| 72 | +//#include <linux/if_arp.h> |
| 73 | |
| 74 | #include "bareudp.h" |
| 75 | #include "netlink-util.h" |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 76 | diff --git a/src/network/netdev/batadv.c b/src/network/netdev/batadv.c |
| 77 | index 15f3aee3a6..ec76428436 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 78 | --- a/src/network/netdev/batadv.c |
| 79 | +++ b/src/network/netdev/batadv.c |
| 80 | @@ -3,7 +3,7 @@ |
| 81 | #include <inttypes.h> |
| 82 | #include <netinet/in.h> |
| 83 | #include <linux/genetlink.h> |
| 84 | -#include <linux/if_arp.h> |
| 85 | +//#include <linux/if_arp.h> |
| 86 | |
| 87 | #include "batadv.h" |
| 88 | #include "fileio.h" |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 89 | diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c |
| 90 | index 5d94aa1d68..4e379a326d 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 91 | --- a/src/network/netdev/bond.c |
| 92 | +++ b/src/network/netdev/bond.c |
| 93 | @@ -1,7 +1,7 @@ |
| 94 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 95 | |
| 96 | #include <netinet/in.h> |
| 97 | -#include <linux/if_arp.h> |
| 98 | +//#include <linux/if_arp.h> |
| 99 | |
| 100 | #include "alloc-util.h" |
| 101 | #include "bond.h" |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 102 | diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c |
| 103 | index b974f2ae0a..9a5f18d556 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 104 | --- a/src/network/netdev/bridge.c |
| 105 | +++ b/src/network/netdev/bridge.c |
| 106 | @@ -2,7 +2,7 @@ |
| 107 | |
| 108 | #include <net/if.h> |
| 109 | #include <netinet/in.h> |
| 110 | -#include <linux/if_arp.h> |
| 111 | +//#include <linux/if_arp.h> |
| 112 | #include <linux/if_bridge.h> |
| 113 | |
| 114 | #include "bridge.h" |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 115 | diff --git a/src/network/netdev/dummy.c b/src/network/netdev/dummy.c |
| 116 | index 00df1d2787..77b506b422 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 117 | --- a/src/network/netdev/dummy.c |
| 118 | +++ b/src/network/netdev/dummy.c |
| 119 | @@ -1,6 +1,6 @@ |
| 120 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 121 | |
| 122 | -#include <linux/if_arp.h> |
| 123 | +//#include <linux/if_arp.h> |
| 124 | |
| 125 | #include "dummy.h" |
| 126 | |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 127 | diff --git a/src/network/netdev/geneve.c b/src/network/netdev/geneve.c |
| 128 | index 224c17e979..fb79cc13f6 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 129 | --- a/src/network/netdev/geneve.c |
| 130 | +++ b/src/network/netdev/geneve.c |
| 131 | @@ -2,7 +2,7 @@ |
| 132 | |
| 133 | #include <net/if.h> |
| 134 | #include <netinet/in.h> |
| 135 | -#include <linux/if_arp.h> |
| 136 | +//#include <linux/if_arp.h> |
| 137 | |
| 138 | #include "alloc-util.h" |
| 139 | #include "conf-parser.h" |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 140 | diff --git a/src/network/netdev/ifb.c b/src/network/netdev/ifb.c |
| 141 | index d7ff44cb9e..e037629ae4 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 142 | --- a/src/network/netdev/ifb.c |
| 143 | +++ b/src/network/netdev/ifb.c |
| 144 | @@ -1,7 +1,7 @@ |
| 145 | /* SPDX-License-Identifier: LGPL-2.1-or-later |
| 146 | * Copyright © 2019 VMware, Inc. */ |
| 147 | |
| 148 | -#include <linux/if_arp.h> |
| 149 | +//#include <linux/if_arp.h> |
| 150 | |
| 151 | #include "ifb.h" |
| 152 | |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 153 | diff --git a/src/network/netdev/ipoib.c b/src/network/netdev/ipoib.c |
| 154 | index e0ff9e8c62..ab085c1f6d 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 155 | --- a/src/network/netdev/ipoib.c |
| 156 | +++ b/src/network/netdev/ipoib.c |
| 157 | @@ -1,6 +1,6 @@ |
| 158 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 159 | |
| 160 | -#include <linux/if_arp.h> |
| 161 | +//#include <linux/if_arp.h> |
| 162 | #include <linux/if_link.h> |
| 163 | |
| 164 | #include "ipoib.h" |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 165 | diff --git a/src/network/netdev/ipvlan.c b/src/network/netdev/ipvlan.c |
| 166 | index d15766cd7b..60728b4f94 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 167 | --- a/src/network/netdev/ipvlan.c |
| 168 | +++ b/src/network/netdev/ipvlan.c |
| 169 | @@ -2,7 +2,7 @@ |
| 170 | |
| 171 | #include <net/if.h> |
| 172 | #include <netinet/in.h> |
| 173 | -#include <linux/if_arp.h> |
| 174 | +//#include <linux/if_arp.h> |
| 175 | |
| 176 | #include "conf-parser.h" |
| 177 | #include "ipvlan.h" |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 178 | diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c |
| 179 | index f1a566a9ca..1f37927a83 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 180 | --- a/src/network/netdev/macsec.c |
| 181 | +++ b/src/network/netdev/macsec.c |
| 182 | @@ -1,7 +1,7 @@ |
| 183 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 184 | |
| 185 | #include <netinet/in.h> |
| 186 | -#include <linux/if_arp.h> |
| 187 | +//#include <linux/if_arp.h> |
| 188 | #include <linux/if_ether.h> |
| 189 | #include <linux/if_macsec.h> |
| 190 | #include <linux/genetlink.h> |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 191 | diff --git a/src/network/netdev/macvlan.c b/src/network/netdev/macvlan.c |
| 192 | index c41be6e78f..ee2660c5bf 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 193 | --- a/src/network/netdev/macvlan.c |
| 194 | +++ b/src/network/netdev/macvlan.c |
| 195 | @@ -2,7 +2,7 @@ |
| 196 | |
| 197 | #include <net/if.h> |
| 198 | #include <netinet/in.h> |
| 199 | -#include <linux/if_arp.h> |
| 200 | +//#include <linux/if_arp.h> |
| 201 | |
| 202 | #include "conf-parser.h" |
| 203 | #include "macvlan.h" |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 204 | diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c |
| 205 | index 8e7fe11c18..701ab2bd69 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 206 | --- a/src/network/netdev/netdev.c |
| 207 | +++ b/src/network/netdev/netdev.c |
| 208 | @@ -2,7 +2,7 @@ |
| 209 | |
| 210 | #include <net/if.h> |
| 211 | #include <netinet/in.h> |
| 212 | -#include <linux/if_arp.h> |
| 213 | +//#include <linux/if_arp.h> |
| 214 | #include <unistd.h> |
| 215 | |
| 216 | #include "alloc-util.h" |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 217 | diff --git a/src/network/netdev/netdevsim.c b/src/network/netdev/netdevsim.c |
| 218 | index 15d5c132f9..a3ffa48b15 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 219 | --- a/src/network/netdev/netdevsim.c |
| 220 | +++ b/src/network/netdev/netdevsim.c |
| 221 | @@ -1,6 +1,6 @@ |
| 222 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 223 | |
| 224 | -#include <linux/if_arp.h> |
| 225 | +//#include <linux/if_arp.h> |
| 226 | |
| 227 | #include "netdevsim.h" |
| 228 | |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 229 | diff --git a/src/network/netdev/nlmon.c b/src/network/netdev/nlmon.c |
| 230 | index ff372092e6..eef66811f4 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 231 | --- a/src/network/netdev/nlmon.c |
| 232 | +++ b/src/network/netdev/nlmon.c |
| 233 | @@ -1,6 +1,6 @@ |
| 234 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 235 | |
| 236 | -#include <linux/if_arp.h> |
| 237 | +//#include <linux/if_arp.h> |
| 238 | |
| 239 | #include "nlmon.h" |
| 240 | |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 241 | diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c |
| 242 | index 97e534fe99..0302c1cb94 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 243 | --- a/src/network/netdev/tunnel.c |
| 244 | +++ b/src/network/netdev/tunnel.c |
| 245 | @@ -2,7 +2,7 @@ |
| 246 | |
| 247 | #include <netinet/in.h> |
| 248 | #include <linux/fou.h> |
| 249 | -#include <linux/if_arp.h> |
| 250 | +//#include <linux/if_arp.h> |
| 251 | #include <linux/if_tunnel.h> |
| 252 | #include <linux/ip.h> |
| 253 | #include <linux/ip6_tunnel.h> |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 254 | diff --git a/src/network/netdev/vcan.c b/src/network/netdev/vcan.c |
| 255 | index 380547ee1e..137c1adf8a 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 256 | --- a/src/network/netdev/vcan.c |
| 257 | +++ b/src/network/netdev/vcan.c |
| 258 | @@ -1,6 +1,6 @@ |
| 259 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 260 | |
| 261 | -#include <linux/if_arp.h> |
| 262 | +//#include <linux/if_arp.h> |
| 263 | |
| 264 | #include "vcan.h" |
| 265 | |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 266 | diff --git a/src/network/netdev/veth.c b/src/network/netdev/veth.c |
| 267 | index c946e81fc0..d1a6be73f9 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 268 | --- a/src/network/netdev/veth.c |
| 269 | +++ b/src/network/netdev/veth.c |
| 270 | @@ -3,7 +3,7 @@ |
| 271 | #include <errno.h> |
| 272 | #include <net/if.h> |
| 273 | #include <netinet/in.h> |
| 274 | -#include <linux/if_arp.h> |
| 275 | +//#include <linux/if_arp.h> |
| 276 | #include <linux/veth.h> |
| 277 | |
| 278 | #include "netlink-util.h" |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 279 | diff --git a/src/network/netdev/vlan.c b/src/network/netdev/vlan.c |
| 280 | index af3e77963e..efa4b0a164 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 281 | --- a/src/network/netdev/vlan.c |
| 282 | +++ b/src/network/netdev/vlan.c |
| 283 | @@ -2,7 +2,7 @@ |
| 284 | |
| 285 | #include <errno.h> |
| 286 | #include <net/if.h> |
| 287 | -#include <linux/if_arp.h> |
| 288 | +//#include <linux/if_arp.h> |
| 289 | #include <linux/if_vlan.h> |
| 290 | |
| 291 | #include "parse-util.h" |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 292 | diff --git a/src/network/netdev/vrf.c b/src/network/netdev/vrf.c |
| 293 | index b1b6707441..1c6d1982e1 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 294 | --- a/src/network/netdev/vrf.c |
| 295 | +++ b/src/network/netdev/vrf.c |
| 296 | @@ -2,7 +2,7 @@ |
| 297 | |
| 298 | #include <net/if.h> |
| 299 | #include <netinet/in.h> |
| 300 | -#include <linux/if_arp.h> |
| 301 | +//#include <linux/if_arp.h> |
| 302 | |
| 303 | #include "vrf.h" |
| 304 | |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 305 | diff --git a/src/network/netdev/vxcan.c b/src/network/netdev/vxcan.c |
| 306 | index a0ba048eb1..875f2e5901 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 307 | --- a/src/network/netdev/vxcan.c |
| 308 | +++ b/src/network/netdev/vxcan.c |
| 309 | @@ -1,7 +1,7 @@ |
| 310 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 311 | |
| 312 | #include <linux/can/vxcan.h> |
| 313 | -#include <linux/if_arp.h> |
| 314 | +//#include <linux/if_arp.h> |
| 315 | |
| 316 | #include "vxcan.h" |
| 317 | |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 318 | diff --git a/src/network/netdev/vxlan.c b/src/network/netdev/vxlan.c |
| 319 | index 30b0855598..a065158801 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 320 | --- a/src/network/netdev/vxlan.c |
| 321 | +++ b/src/network/netdev/vxlan.c |
| 322 | @@ -2,7 +2,7 @@ |
| 323 | |
| 324 | #include <net/if.h> |
| 325 | #include <netinet/in.h> |
| 326 | -#include <linux/if_arp.h> |
| 327 | +//#include <linux/if_arp.h> |
| 328 | |
| 329 | #include "conf-parser.h" |
| 330 | #include "alloc-util.h" |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 331 | diff --git a/src/network/netdev/wireguard.c b/src/network/netdev/wireguard.c |
| 332 | index 88f668753a..5fc753384b 100644 |
| 333 | --- a/src/network/netdev/wireguard.c |
| 334 | +++ b/src/network/netdev/wireguard.c |
| 335 | @@ -6,7 +6,7 @@ |
| 336 | #include <sys/ioctl.h> |
| 337 | #include <net/if.h> |
| 338 | #include <netinet/in.h> |
| 339 | -#include <linux/if_arp.h> |
| 340 | +//#include <linux/if_arp.h> |
| 341 | #include <linux/ipv6_route.h> |
| 342 | |
| 343 | #include "sd-resolve.h" |
| 344 | diff --git a/src/network/netdev/xfrm.c b/src/network/netdev/xfrm.c |
| 345 | index ef5e735b2b..419afd75f2 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 346 | --- a/src/network/netdev/xfrm.c |
| 347 | +++ b/src/network/netdev/xfrm.c |
| 348 | @@ -1,6 +1,6 @@ |
| 349 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 350 | |
| 351 | -#include <linux/if_arp.h> |
| 352 | +//#include <linux/if_arp.h> |
| 353 | |
| 354 | #include "missing_network.h" |
| 355 | #include "xfrm.h" |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 356 | diff --git a/src/network/networkd-bridge-mdb.c b/src/network/networkd-bridge-mdb.c |
| 357 | index 10025a97ae..a0239ea83a 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 358 | --- a/src/network/networkd-bridge-mdb.c |
| 359 | +++ b/src/network/networkd-bridge-mdb.c |
| 360 | @@ -1,7 +1,5 @@ |
| 361 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 362 | |
| 363 | -#include <net/if.h> |
| 364 | -#include <linux/if_bridge.h> |
| 365 | |
| 366 | #include "netlink-util.h" |
| 367 | #include "networkd-bridge-mdb.h" |
| 368 | @@ -11,6 +9,8 @@ |
| 369 | #include "networkd-queue.h" |
| 370 | #include "string-util.h" |
| 371 | #include "vlan-util.h" |
| 372 | +#include <net/if.h> |
| 373 | +#include <linux/if_bridge.h> |
| 374 | |
| 375 | #define STATIC_BRIDGE_MDB_ENTRIES_PER_NETWORK_MAX 1024U |
| 376 | |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 377 | diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c |
| 378 | index 7996960bd1..e870b9ba26 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 379 | --- a/src/network/networkd-dhcp-common.c |
| 380 | +++ b/src/network/networkd-dhcp-common.c |
| 381 | @@ -1,7 +1,8 @@ |
| 382 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 383 | |
| 384 | #include <netinet/in.h> |
| 385 | -#include <linux/if_arp.h> |
| 386 | +//#include <linux/if_arp.h> |
| 387 | +#include <net/if.h> |
| 388 | |
| 389 | #include "bus-error.h" |
| 390 | #include "dhcp-identifier.h" |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 391 | diff --git a/src/network/networkd-dhcp-prefix-delegation.c b/src/network/networkd-dhcp-prefix-delegation.c |
| 392 | index 7be9713d46..e830fcd575 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 393 | --- a/src/network/networkd-dhcp-prefix-delegation.c |
| 394 | +++ b/src/network/networkd-dhcp-prefix-delegation.c |
| 395 | @@ -1,7 +1,5 @@ |
| 396 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 397 | |
| 398 | -#include <linux/ipv6_route.h> |
| 399 | - |
| 400 | #include "sd-dhcp6-client.h" |
| 401 | |
| 402 | #include "hashmap.h" |
| 403 | @@ -21,6 +19,8 @@ |
| 404 | #include "strv.h" |
| 405 | #include "tunnel.h" |
| 406 | |
| 407 | +#include <linux/ipv6_route.h> |
| 408 | + |
| 409 | bool link_dhcp_pd_is_enabled(Link *link) { |
| 410 | assert(link); |
| 411 | |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 412 | diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c |
| 413 | index 9acfd17d49..3108289602 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 414 | --- a/src/network/networkd-dhcp-server.c |
| 415 | +++ b/src/network/networkd-dhcp-server.c |
| 416 | @@ -1,7 +1,7 @@ |
| 417 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 418 | |
| 419 | #include <netinet/in.h> |
| 420 | -#include <linux/if_arp.h> |
| 421 | +//#include <linux/if_arp.h> |
| 422 | #include <linux/if.h> |
| 423 | |
| 424 | #include "sd-dhcp-server.h" |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 425 | diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c |
| 426 | index cb9c428ae9..a35d58f3f1 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 427 | --- a/src/network/networkd-dhcp4.c |
| 428 | +++ b/src/network/networkd-dhcp4.c |
| 429 | @@ -3,7 +3,7 @@ |
| 430 | #include <netinet/in.h> |
| 431 | #include <netinet/ip.h> |
| 432 | #include <linux/if.h> |
| 433 | -#include <linux/if_arp.h> |
| 434 | +//#include <linux/if_arp.h> |
| 435 | |
| 436 | #include "alloc-util.h" |
| 437 | #include "dhcp-client-internal.h" |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame^] | 438 | diff --git a/src/network/networkd-ipv6ll.c b/src/network/networkd-ipv6ll.c |
| 439 | index dc09171afe..5b93ef3dd4 100644 |
| 440 | --- a/src/network/networkd-ipv6ll.c |
| 441 | +++ b/src/network/networkd-ipv6ll.c |
| 442 | @@ -1,7 +1,7 @@ |
| 443 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 444 | |
| 445 | #include <linux/if.h> |
| 446 | -#include <linux/if_arp.h> |
| 447 | +//#include <linux/if_arp.h> |
| 448 | |
| 449 | #include "in-addr-util.h" |
| 450 | #include "networkd-address.h" |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 451 | diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame^] | 452 | index 63679505f7..825ea76ff2 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 453 | --- a/src/network/networkd-link.c |
| 454 | +++ b/src/network/networkd-link.c |
| 455 | @@ -3,7 +3,7 @@ |
| 456 | #include <net/if.h> |
| 457 | #include <netinet/in.h> |
| 458 | #include <linux/if.h> |
| 459 | -#include <linux/if_arp.h> |
| 460 | +//#include <linux/if_arp.h> |
| 461 | #include <linux/if_link.h> |
| 462 | #include <linux/netdevice.h> |
| 463 | #include <sys/socket.h> |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame^] | 464 | diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c |
| 465 | index efe407fedb..46a086cdf5 100644 |
| 466 | --- a/src/network/networkd-ndisc.c |
| 467 | +++ b/src/network/networkd-ndisc.c |
| 468 | @@ -6,7 +6,7 @@ |
| 469 | #include <arpa/inet.h> |
| 470 | #include <netinet/icmp6.h> |
| 471 | #include <linux/if.h> |
| 472 | -#include <linux/if_arp.h> |
| 473 | +//#include <linux/if_arp.h> |
| 474 | |
| 475 | #include "sd-ndisc.h" |
| 476 | |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 477 | diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame^] | 478 | index 934fed3b7f..fdb89313dd 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 479 | --- a/src/network/networkd-route.c |
| 480 | +++ b/src/network/networkd-route.c |
| 481 | @@ -1,9 +1,5 @@ |
| 482 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 483 | |
| 484 | -#include <linux/icmpv6.h> |
| 485 | -#include <linux/ipv6_route.h> |
| 486 | -#include <linux/nexthop.h> |
| 487 | - |
| 488 | #include "alloc-util.h" |
| 489 | #include "event-util.h" |
| 490 | #include "netlink-util.h" |
| 491 | @@ -21,6 +17,10 @@ |
| 492 | #include "vrf.h" |
| 493 | #include "wireguard.h" |
| 494 | |
| 495 | +#include <linux/icmpv6.h> |
| 496 | +#include <linux/ipv6_route.h> |
| 497 | +#include <linux/nexthop.h> |
| 498 | + |
| 499 | int route_new(Route **ret) { |
| 500 | _cleanup_(route_freep) Route *route = NULL; |
| 501 | |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 502 | diff --git a/src/network/networkd-setlink.c b/src/network/networkd-setlink.c |
| 503 | index e00cc1e589..e392c7e1a2 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 504 | --- a/src/network/networkd-setlink.c |
| 505 | +++ b/src/network/networkd-setlink.c |
| 506 | @@ -2,7 +2,7 @@ |
| 507 | |
| 508 | #include <netinet/in.h> |
| 509 | #include <linux/if.h> |
| 510 | -#include <linux/if_arp.h> |
| 511 | +//#include <linux/if_arp.h> |
| 512 | #include <linux/if_bridge.h> |
| 513 | |
| 514 | #include "missing_network.h" |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 515 | diff --git a/src/shared/linux/ethtool.h b/src/shared/linux/ethtool.h |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame^] | 516 | index cf20b6dba5..c3a46dda11 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 517 | --- a/src/shared/linux/ethtool.h |
| 518 | +++ b/src/shared/linux/ethtool.h |
| 519 | @@ -16,7 +16,8 @@ |
| 520 | |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame^] | 521 | #include <linux/const.h> |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 522 | #include <linux/types.h> |
| 523 | -#include <linux/if_ether.h> |
| 524 | +#include <netinet/if_ether.h> |
| 525 | +//#include <linux/if_ether.h> |
| 526 | |
| 527 | #ifndef __KERNEL__ |
| 528 | #include <limits.h> /* for INT_MAX */ |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 529 | diff --git a/src/shared/netif-util.c b/src/shared/netif-util.c |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame^] | 530 | index f56c5646c1..5af28ff119 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 531 | --- a/src/shared/netif-util.c |
| 532 | +++ b/src/shared/netif-util.c |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame^] | 533 | @@ -1,7 +1,7 @@ |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 534 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 535 | |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame^] | 536 | #include <linux/if.h> |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 537 | -#include <linux/if_arp.h> |
| 538 | +//#include <linux/if_arp.h> |
| 539 | |
| 540 | #include "arphrd-util.h" |
| 541 | #include "device-util.h" |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 542 | diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame^] | 543 | index f2ea2a7cd5..fe60a0744d 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 544 | --- a/src/udev/udev-builtin-net_id.c |
| 545 | +++ b/src/udev/udev-builtin-net_id.c |
| 546 | @@ -18,7 +18,7 @@ |
| 547 | #include <stdarg.h> |
| 548 | #include <unistd.h> |
| 549 | #include <linux/if.h> |
| 550 | -#include <linux/if_arp.h> |
| 551 | +//#include <linux/if_arp.h> |
| 552 | #include <linux/netdevice.h> |
| 553 | #include <linux/pci_regs.h> |
| 554 | |