Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 1 | From e5f067cb3dc845dd865e450f4e64077b28feb4c0 Mon Sep 17 00:00:00 2001 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +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> |
| 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 +- |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 32 | src/network/netdev/wireguard.c | 2 +- |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 33 | src/network/netdev/xfrm.c | 2 +- |
| 34 | src/network/networkd-bridge-mdb.c | 4 ++-- |
| 35 | src/network/networkd-dhcp-common.c | 3 ++- |
| 36 | src/network/networkd-dhcp-prefix-delegation.c | 4 ++-- |
| 37 | src/network/networkd-dhcp-server.c | 2 +- |
| 38 | src/network/networkd-dhcp4.c | 2 +- |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 39 | src/network/networkd-ipv6ll.c | 2 +- |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 40 | src/network/networkd-link.c | 2 +- |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 41 | src/network/networkd-ndisc.c | 2 +- |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 42 | src/network/networkd-route.c | 8 ++++---- |
| 43 | src/network/networkd-setlink.c | 2 +- |
| 44 | src/shared/linux/ethtool.h | 3 ++- |
| 45 | src/shared/netif-util.c | 2 +- |
| 46 | src/udev/udev-builtin-net_id.c | 2 +- |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 47 | 37 files changed, 44 insertions(+), 42 deletions(-) |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 48 | |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 49 | diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c |
| 50 | index 57dd91f81f..2b7f4fa3a7 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 51 | --- a/src/libsystemd-network/sd-dhcp6-client.c |
| 52 | +++ b/src/libsystemd-network/sd-dhcp6-client.c |
| 53 | @@ -5,7 +5,7 @@ |
| 54 | |
| 55 | #include <errno.h> |
| 56 | #include <sys/ioctl.h> |
| 57 | -#include <linux/if_arp.h> |
| 58 | +//#include <linux/if_arp.h> |
| 59 | #include <linux/if_infiniband.h> |
| 60 | |
| 61 | #include "sd-dhcp6-client.h" |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 62 | diff --git a/src/network/netdev/bareudp.c b/src/network/netdev/bareudp.c |
| 63 | index 24d3afb877..f6241b41ee 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 64 | --- a/src/network/netdev/bareudp.c |
| 65 | +++ b/src/network/netdev/bareudp.c |
| 66 | @@ -2,7 +2,7 @@ |
| 67 | * Copyright © 2020 VMware, Inc. */ |
| 68 | |
| 69 | #include <netinet/in.h> |
| 70 | -#include <linux/if_arp.h> |
| 71 | +//#include <linux/if_arp.h> |
| 72 | |
| 73 | #include "bareudp.h" |
| 74 | #include "netlink-util.h" |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 75 | diff --git a/src/network/netdev/batadv.c b/src/network/netdev/batadv.c |
| 76 | index 7e97619657..50fcffcfdf 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 77 | --- a/src/network/netdev/batadv.c |
| 78 | +++ b/src/network/netdev/batadv.c |
| 79 | @@ -3,7 +3,7 @@ |
| 80 | #include <inttypes.h> |
| 81 | #include <netinet/in.h> |
| 82 | #include <linux/genetlink.h> |
| 83 | -#include <linux/if_arp.h> |
| 84 | +//#include <linux/if_arp.h> |
| 85 | |
| 86 | #include "batadv.h" |
| 87 | #include "fileio.h" |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 88 | diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c |
| 89 | index 601bff0a9c..dfed8d9e54 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 90 | --- a/src/network/netdev/bond.c |
| 91 | +++ b/src/network/netdev/bond.c |
| 92 | @@ -1,7 +1,7 @@ |
| 93 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 94 | |
| 95 | #include <netinet/in.h> |
| 96 | -#include <linux/if_arp.h> |
| 97 | +//#include <linux/if_arp.h> |
| 98 | |
| 99 | #include "alloc-util.h" |
| 100 | #include "bond.h" |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 101 | diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c |
| 102 | index b65c3b49fc..6875b4fbdb 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 103 | --- a/src/network/netdev/bridge.c |
| 104 | +++ b/src/network/netdev/bridge.c |
| 105 | @@ -2,7 +2,7 @@ |
| 106 | |
| 107 | #include <net/if.h> |
| 108 | #include <netinet/in.h> |
| 109 | -#include <linux/if_arp.h> |
| 110 | +//#include <linux/if_arp.h> |
| 111 | #include <linux/if_bridge.h> |
| 112 | |
| 113 | #include "bridge.h" |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 114 | diff --git a/src/network/netdev/dummy.c b/src/network/netdev/dummy.c |
| 115 | index 00df1d2787..77b506b422 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 116 | --- a/src/network/netdev/dummy.c |
| 117 | +++ b/src/network/netdev/dummy.c |
| 118 | @@ -1,6 +1,6 @@ |
| 119 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 120 | |
| 121 | -#include <linux/if_arp.h> |
| 122 | +//#include <linux/if_arp.h> |
| 123 | |
| 124 | #include "dummy.h" |
| 125 | |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 126 | diff --git a/src/network/netdev/geneve.c b/src/network/netdev/geneve.c |
| 127 | index 777a32d75c..73bfa2b5c1 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 128 | --- a/src/network/netdev/geneve.c |
| 129 | +++ b/src/network/netdev/geneve.c |
| 130 | @@ -2,7 +2,7 @@ |
| 131 | |
| 132 | #include <net/if.h> |
| 133 | #include <netinet/in.h> |
| 134 | -#include <linux/if_arp.h> |
| 135 | +//#include <linux/if_arp.h> |
| 136 | |
| 137 | #include "alloc-util.h" |
| 138 | #include "conf-parser.h" |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 139 | diff --git a/src/network/netdev/ifb.c b/src/network/netdev/ifb.c |
| 140 | index d7ff44cb9e..e037629ae4 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 141 | --- a/src/network/netdev/ifb.c |
| 142 | +++ b/src/network/netdev/ifb.c |
| 143 | @@ -1,7 +1,7 @@ |
| 144 | /* SPDX-License-Identifier: LGPL-2.1-or-later |
| 145 | * Copyright © 2019 VMware, Inc. */ |
| 146 | |
| 147 | -#include <linux/if_arp.h> |
| 148 | +//#include <linux/if_arp.h> |
| 149 | |
| 150 | #include "ifb.h" |
| 151 | |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 152 | diff --git a/src/network/netdev/ipoib.c b/src/network/netdev/ipoib.c |
| 153 | index 5dd9286d57..4036d66dad 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 154 | --- a/src/network/netdev/ipoib.c |
| 155 | +++ b/src/network/netdev/ipoib.c |
| 156 | @@ -1,6 +1,6 @@ |
| 157 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 158 | |
| 159 | -#include <linux/if_arp.h> |
| 160 | +//#include <linux/if_arp.h> |
| 161 | #include <linux/if_link.h> |
| 162 | |
| 163 | #include "ipoib.h" |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 164 | diff --git a/src/network/netdev/ipvlan.c b/src/network/netdev/ipvlan.c |
| 165 | index 058eadebd7..c470ebb6d7 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 166 | --- a/src/network/netdev/ipvlan.c |
| 167 | +++ b/src/network/netdev/ipvlan.c |
| 168 | @@ -2,7 +2,7 @@ |
| 169 | |
| 170 | #include <net/if.h> |
| 171 | #include <netinet/in.h> |
| 172 | -#include <linux/if_arp.h> |
| 173 | +//#include <linux/if_arp.h> |
| 174 | |
| 175 | #include "conf-parser.h" |
| 176 | #include "ipvlan.h" |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 177 | diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c |
| 178 | index 0da3dd4bd2..eb20f04469 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 179 | --- a/src/network/netdev/macsec.c |
| 180 | +++ b/src/network/netdev/macsec.c |
| 181 | @@ -1,7 +1,7 @@ |
| 182 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 183 | |
| 184 | #include <netinet/in.h> |
| 185 | -#include <linux/if_arp.h> |
| 186 | +//#include <linux/if_arp.h> |
| 187 | #include <linux/if_ether.h> |
| 188 | #include <linux/if_macsec.h> |
| 189 | #include <linux/genetlink.h> |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 190 | diff --git a/src/network/netdev/macvlan.c b/src/network/netdev/macvlan.c |
| 191 | index 1114bb0cb1..6c79a219a4 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 192 | --- a/src/network/netdev/macvlan.c |
| 193 | +++ b/src/network/netdev/macvlan.c |
| 194 | @@ -2,7 +2,7 @@ |
| 195 | |
| 196 | #include <net/if.h> |
| 197 | #include <netinet/in.h> |
| 198 | -#include <linux/if_arp.h> |
| 199 | +//#include <linux/if_arp.h> |
| 200 | |
| 201 | #include "conf-parser.h" |
| 202 | #include "macvlan.h" |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 203 | diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c |
| 204 | index 038a27c118..67155f0db7 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 205 | --- a/src/network/netdev/netdev.c |
| 206 | +++ b/src/network/netdev/netdev.c |
| 207 | @@ -2,7 +2,7 @@ |
| 208 | |
| 209 | #include <net/if.h> |
| 210 | #include <netinet/in.h> |
| 211 | -#include <linux/if_arp.h> |
| 212 | +//#include <linux/if_arp.h> |
| 213 | #include <unistd.h> |
| 214 | |
| 215 | #include "alloc-util.h" |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 216 | diff --git a/src/network/netdev/netdevsim.c b/src/network/netdev/netdevsim.c |
| 217 | index 15d5c132f9..a3ffa48b15 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 218 | --- a/src/network/netdev/netdevsim.c |
| 219 | +++ b/src/network/netdev/netdevsim.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 "netdevsim.h" |
| 227 | |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 228 | diff --git a/src/network/netdev/nlmon.c b/src/network/netdev/nlmon.c |
| 229 | index ff372092e6..eef66811f4 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 230 | --- a/src/network/netdev/nlmon.c |
| 231 | +++ b/src/network/netdev/nlmon.c |
| 232 | @@ -1,6 +1,6 @@ |
| 233 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 234 | |
| 235 | -#include <linux/if_arp.h> |
| 236 | +//#include <linux/if_arp.h> |
| 237 | |
| 238 | #include "nlmon.h" |
| 239 | |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 240 | diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c |
| 241 | index 2addfeecaa..954987f26d 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 242 | --- a/src/network/netdev/tunnel.c |
| 243 | +++ b/src/network/netdev/tunnel.c |
| 244 | @@ -2,7 +2,7 @@ |
| 245 | |
| 246 | #include <netinet/in.h> |
| 247 | #include <linux/fou.h> |
| 248 | -#include <linux/if_arp.h> |
| 249 | +//#include <linux/if_arp.h> |
| 250 | #include <linux/if_tunnel.h> |
| 251 | #include <linux/ip.h> |
| 252 | #include <linux/ip6_tunnel.h> |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 253 | diff --git a/src/network/netdev/vcan.c b/src/network/netdev/vcan.c |
| 254 | index 380547ee1e..137c1adf8a 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 255 | --- a/src/network/netdev/vcan.c |
| 256 | +++ b/src/network/netdev/vcan.c |
| 257 | @@ -1,6 +1,6 @@ |
| 258 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 259 | |
| 260 | -#include <linux/if_arp.h> |
| 261 | +//#include <linux/if_arp.h> |
| 262 | |
| 263 | #include "vcan.h" |
| 264 | |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 265 | diff --git a/src/network/netdev/veth.c b/src/network/netdev/veth.c |
| 266 | index fb00e6667f..f52d9ee89a 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 267 | --- a/src/network/netdev/veth.c |
| 268 | +++ b/src/network/netdev/veth.c |
| 269 | @@ -3,7 +3,7 @@ |
| 270 | #include <errno.h> |
| 271 | #include <net/if.h> |
| 272 | #include <netinet/in.h> |
| 273 | -#include <linux/if_arp.h> |
| 274 | +//#include <linux/if_arp.h> |
| 275 | #include <linux/veth.h> |
| 276 | |
| 277 | #include "netlink-util.h" |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 278 | diff --git a/src/network/netdev/vlan.c b/src/network/netdev/vlan.c |
| 279 | index a3d961dac3..386b567a42 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 280 | --- a/src/network/netdev/vlan.c |
| 281 | +++ b/src/network/netdev/vlan.c |
| 282 | @@ -2,7 +2,7 @@ |
| 283 | |
| 284 | #include <errno.h> |
| 285 | #include <net/if.h> |
| 286 | -#include <linux/if_arp.h> |
| 287 | +//#include <linux/if_arp.h> |
| 288 | #include <linux/if_vlan.h> |
| 289 | |
| 290 | #include "parse-util.h" |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 291 | diff --git a/src/network/netdev/vrf.c b/src/network/netdev/vrf.c |
| 292 | index 05ef3ff13d..825fc4a398 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 293 | --- a/src/network/netdev/vrf.c |
| 294 | +++ b/src/network/netdev/vrf.c |
| 295 | @@ -2,7 +2,7 @@ |
| 296 | |
| 297 | #include <net/if.h> |
| 298 | #include <netinet/in.h> |
| 299 | -#include <linux/if_arp.h> |
| 300 | +//#include <linux/if_arp.h> |
| 301 | |
| 302 | #include "vrf.h" |
| 303 | |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 304 | diff --git a/src/network/netdev/vxcan.c b/src/network/netdev/vxcan.c |
| 305 | index 83269b0707..39c6dbe29c 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 306 | --- a/src/network/netdev/vxcan.c |
| 307 | +++ b/src/network/netdev/vxcan.c |
| 308 | @@ -1,7 +1,7 @@ |
| 309 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 310 | |
| 311 | #include <linux/can/vxcan.h> |
| 312 | -#include <linux/if_arp.h> |
| 313 | +//#include <linux/if_arp.h> |
| 314 | |
| 315 | #include "vxcan.h" |
| 316 | |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 317 | diff --git a/src/network/netdev/vxlan.c b/src/network/netdev/vxlan.c |
| 318 | index 589161938a..0ec9625b7a 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 319 | --- a/src/network/netdev/vxlan.c |
| 320 | +++ b/src/network/netdev/vxlan.c |
| 321 | @@ -2,7 +2,7 @@ |
| 322 | |
| 323 | #include <net/if.h> |
| 324 | #include <netinet/in.h> |
| 325 | -#include <linux/if_arp.h> |
| 326 | +//#include <linux/if_arp.h> |
| 327 | |
| 328 | #include "conf-parser.h" |
| 329 | #include "alloc-util.h" |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 330 | diff --git a/src/network/netdev/wireguard.c b/src/network/netdev/wireguard.c |
| 331 | index 51e7e02990..fc36c0623a 100644 |
| 332 | --- a/src/network/netdev/wireguard.c |
| 333 | +++ b/src/network/netdev/wireguard.c |
| 334 | @@ -6,7 +6,7 @@ |
| 335 | #include <sys/ioctl.h> |
| 336 | #include <net/if.h> |
| 337 | #include <netinet/in.h> |
| 338 | -#include <linux/if_arp.h> |
| 339 | +//#include <linux/if_arp.h> |
| 340 | #include <linux/ipv6_route.h> |
| 341 | |
| 342 | #include "sd-resolve.h" |
| 343 | diff --git a/src/network/netdev/xfrm.c b/src/network/netdev/xfrm.c |
| 344 | index a961d8fef2..6c1815b257 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 345 | --- a/src/network/netdev/xfrm.c |
| 346 | +++ b/src/network/netdev/xfrm.c |
| 347 | @@ -1,6 +1,6 @@ |
| 348 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 349 | |
| 350 | -#include <linux/if_arp.h> |
| 351 | +//#include <linux/if_arp.h> |
| 352 | |
| 353 | #include "missing_network.h" |
| 354 | #include "xfrm.h" |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 355 | diff --git a/src/network/networkd-bridge-mdb.c b/src/network/networkd-bridge-mdb.c |
| 356 | index bd1a9745dc..949d3da029 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 357 | --- a/src/network/networkd-bridge-mdb.c |
| 358 | +++ b/src/network/networkd-bridge-mdb.c |
| 359 | @@ -1,7 +1,5 @@ |
| 360 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 361 | |
| 362 | -#include <net/if.h> |
| 363 | -#include <linux/if_bridge.h> |
| 364 | |
| 365 | #include "netlink-util.h" |
| 366 | #include "networkd-bridge-mdb.h" |
| 367 | @@ -11,6 +9,8 @@ |
| 368 | #include "networkd-queue.h" |
| 369 | #include "string-util.h" |
| 370 | #include "vlan-util.h" |
| 371 | +#include <net/if.h> |
| 372 | +#include <linux/if_bridge.h> |
| 373 | |
| 374 | #define STATIC_BRIDGE_MDB_ENTRIES_PER_NETWORK_MAX 1024U |
| 375 | |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 376 | diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c |
| 377 | index ca9a825e7b..8735e261ad 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 378 | --- a/src/network/networkd-dhcp-common.c |
| 379 | +++ b/src/network/networkd-dhcp-common.c |
| 380 | @@ -1,7 +1,8 @@ |
| 381 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 382 | |
| 383 | #include <netinet/in.h> |
| 384 | -#include <linux/if_arp.h> |
| 385 | +//#include <linux/if_arp.h> |
| 386 | +#include <net/if.h> |
| 387 | |
| 388 | #include "bus-error.h" |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 389 | #include "bus-locator.h" |
| 390 | diff --git a/src/network/networkd-dhcp-prefix-delegation.c b/src/network/networkd-dhcp-prefix-delegation.c |
| 391 | index 66c5e979d9..581b6b8c29 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 392 | --- a/src/network/networkd-dhcp-prefix-delegation.c |
| 393 | +++ b/src/network/networkd-dhcp-prefix-delegation.c |
| 394 | @@ -1,7 +1,5 @@ |
| 395 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 396 | |
| 397 | -#include <linux/ipv6_route.h> |
| 398 | - |
| 399 | #include "sd-dhcp6-client.h" |
| 400 | |
| 401 | #include "hashmap.h" |
| 402 | @@ -21,6 +19,8 @@ |
| 403 | #include "strv.h" |
| 404 | #include "tunnel.h" |
| 405 | |
| 406 | +#include <linux/ipv6_route.h> |
| 407 | + |
| 408 | bool link_dhcp_pd_is_enabled(Link *link) { |
| 409 | assert(link); |
| 410 | |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 411 | diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c |
| 412 | index 620fbbddc7..c8af20fb34 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 413 | --- a/src/network/networkd-dhcp-server.c |
| 414 | +++ b/src/network/networkd-dhcp-server.c |
| 415 | @@ -1,7 +1,7 @@ |
| 416 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 417 | |
| 418 | #include <netinet/in.h> |
| 419 | -#include <linux/if_arp.h> |
| 420 | +//#include <linux/if_arp.h> |
| 421 | #include <linux/if.h> |
| 422 | |
| 423 | #include "sd-dhcp-server.h" |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 424 | diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c |
| 425 | index d4b4942173..3d78da5609 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 426 | --- a/src/network/networkd-dhcp4.c |
| 427 | +++ b/src/network/networkd-dhcp4.c |
| 428 | @@ -3,7 +3,7 @@ |
| 429 | #include <netinet/in.h> |
| 430 | #include <netinet/ip.h> |
| 431 | #include <linux/if.h> |
| 432 | -#include <linux/if_arp.h> |
| 433 | +//#include <linux/if_arp.h> |
| 434 | |
| 435 | #include "alloc-util.h" |
| 436 | #include "dhcp-client-internal.h" |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 437 | diff --git a/src/network/networkd-ipv6ll.c b/src/network/networkd-ipv6ll.c |
| 438 | index 32229a3fc7..662a345d6e 100644 |
| 439 | --- a/src/network/networkd-ipv6ll.c |
| 440 | +++ b/src/network/networkd-ipv6ll.c |
| 441 | @@ -1,7 +1,7 @@ |
| 442 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 443 | |
| 444 | #include <linux/if.h> |
| 445 | -#include <linux/if_arp.h> |
| 446 | +//#include <linux/if_arp.h> |
| 447 | |
| 448 | #include "in-addr-util.h" |
| 449 | #include "networkd-address.h" |
| 450 | diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c |
| 451 | index 019bef0590..657fc41ae6 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 452 | --- a/src/network/networkd-link.c |
| 453 | +++ b/src/network/networkd-link.c |
| 454 | @@ -3,7 +3,7 @@ |
| 455 | #include <net/if.h> |
| 456 | #include <netinet/in.h> |
| 457 | #include <linux/if.h> |
| 458 | -#include <linux/if_arp.h> |
| 459 | +//#include <linux/if_arp.h> |
| 460 | #include <linux/if_link.h> |
| 461 | #include <linux/netdevice.h> |
| 462 | #include <sys/socket.h> |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 463 | diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c |
| 464 | index 99a07e16fc..e51cd81d96 100644 |
| 465 | --- a/src/network/networkd-ndisc.c |
| 466 | +++ b/src/network/networkd-ndisc.c |
| 467 | @@ -6,7 +6,7 @@ |
| 468 | #include <arpa/inet.h> |
| 469 | #include <netinet/icmp6.h> |
| 470 | #include <linux/if.h> |
| 471 | -#include <linux/if_arp.h> |
| 472 | +//#include <linux/if_arp.h> |
| 473 | |
| 474 | #include "sd-ndisc.h" |
| 475 | |
| 476 | diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c |
| 477 | index 5214a8ad2c..9dd758daae 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 478 | --- a/src/network/networkd-route.c |
| 479 | +++ b/src/network/networkd-route.c |
| 480 | @@ -1,9 +1,5 @@ |
| 481 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 482 | |
| 483 | -#include <linux/icmpv6.h> |
| 484 | -#include <linux/ipv6_route.h> |
| 485 | -#include <linux/nexthop.h> |
| 486 | - |
| 487 | #include "alloc-util.h" |
| 488 | #include "event-util.h" |
| 489 | #include "netlink-util.h" |
| 490 | @@ -21,6 +17,10 @@ |
| 491 | #include "vrf.h" |
| 492 | #include "wireguard.h" |
| 493 | |
| 494 | +#include <linux/icmpv6.h> |
| 495 | +#include <linux/ipv6_route.h> |
| 496 | +#include <linux/nexthop.h> |
| 497 | + |
| 498 | int route_new(Route **ret) { |
| 499 | _cleanup_(route_freep) Route *route = NULL; |
| 500 | |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 501 | diff --git a/src/network/networkd-setlink.c b/src/network/networkd-setlink.c |
| 502 | index 541c4b8a72..06ebda8f0f 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 503 | --- a/src/network/networkd-setlink.c |
| 504 | +++ b/src/network/networkd-setlink.c |
| 505 | @@ -2,7 +2,7 @@ |
| 506 | |
| 507 | #include <netinet/in.h> |
| 508 | #include <linux/if.h> |
| 509 | -#include <linux/if_arp.h> |
| 510 | +//#include <linux/if_arp.h> |
| 511 | #include <linux/if_bridge.h> |
| 512 | |
| 513 | #include "missing_network.h" |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 514 | diff --git a/src/shared/linux/ethtool.h b/src/shared/linux/ethtool.h |
| 515 | index 1458de3627..d5c2d2e0ac 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 516 | --- a/src/shared/linux/ethtool.h |
| 517 | +++ b/src/shared/linux/ethtool.h |
| 518 | @@ -16,7 +16,8 @@ |
| 519 | |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 520 | #include <linux/const.h> |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 521 | #include <linux/types.h> |
| 522 | -#include <linux/if_ether.h> |
| 523 | +#include <netinet/if_ether.h> |
| 524 | +//#include <linux/if_ether.h> |
| 525 | |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 526 | #include <limits.h> /* for INT_MAX */ |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 527 | |
| 528 | diff --git a/src/shared/netif-util.c b/src/shared/netif-util.c |
| 529 | index f56c5646c1..5af28ff119 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 530 | --- a/src/shared/netif-util.c |
| 531 | +++ b/src/shared/netif-util.c |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 532 | @@ -1,7 +1,7 @@ |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 533 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 534 | |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 535 | #include <linux/if.h> |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 536 | -#include <linux/if_arp.h> |
| 537 | +//#include <linux/if_arp.h> |
| 538 | |
| 539 | #include "arphrd-util.h" |
| 540 | #include "device-util.h" |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 541 | diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c |
| 542 | index a48d5dedf8..31a8bc1b3c 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 543 | --- a/src/udev/udev-builtin-net_id.c |
| 544 | +++ b/src/udev/udev-builtin-net_id.c |
| 545 | @@ -18,7 +18,7 @@ |
| 546 | #include <stdarg.h> |
| 547 | #include <unistd.h> |
| 548 | #include <linux/if.h> |
| 549 | -#include <linux/if_arp.h> |
| 550 | +//#include <linux/if_arp.h> |
| 551 | #include <linux/netdevice.h> |
| 552 | #include <linux/pci_regs.h> |
| 553 | |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame] | 554 | -- |
| 555 | 2.39.2 |
| 556 | |