Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 1 | From d3ed0da271738fd0fc3d3e4d82d6f5810334b05e Mon Sep 17 00:00:00 2001 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 26 Oct 2017 22:10:42 -0700 |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 4 | Subject: [PATCH 06/26] Include netinet/if_ether.h |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 5 | |
| 6 | Fixes |
| 7 | /path/to/systemd/recipe-sysroot/usr/include/netinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr' |
| 8 | struct ethhdr { |
| 9 | ^~~~~~ |
| 10 | |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 11 | and related arphdr, arpreq, and arpreq_old errors |
| 12 | /path/to/systemd/recipe-sysroot/usr/include/net/if_arp.h:22:8: error: redefinition of 'struct arphdr' |
| 13 | struct arphdr { |
| 14 | ^~~~~~ |
| 15 | |
| 16 | The latter requires removing some includes of net/if_arp.h to avoid |
| 17 | conflicting with netinet/if_ether.h. |
| 18 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 19 | Upstream-Status: Inappropriate [musl specific] |
| 20 | |
| 21 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 22 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 23 | [rebased for systemd 243] |
| 24 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 25 | |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 26 | Upstream-Status: Inappropriate [musl specific] |
| 27 | |
| 28 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 29 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
| 30 | [rebased for systemd 243] |
| 31 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 32 | [rebased for systemd 247] |
| 33 | Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 34 | --- |
| 35 | src/libsystemd-network/sd-dhcp6-client.c | 1 - |
| 36 | src/libsystemd/sd-netlink/netlink-types.c | 1 + |
| 37 | src/machine/machine-dbus.c | 1 + |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 38 | src/network/netdev/bond.c | 1 + |
| 39 | src/network/netdev/bridge.c | 1 + |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 40 | src/network/netdev/macsec.c | 1 + |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 41 | src/network/netdev/netdev-gperf.gperf | 1 + |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 42 | src/network/netdev/netdev.c | 1 + |
| 43 | src/network/networkd-brvlan.c | 1 + |
| 44 | src/network/networkd-dhcp-common.c | 1 + |
| 45 | src/network/networkd-dhcp4.c | 2 +- |
| 46 | src/network/networkd-dhcp6.c | 2 +- |
| 47 | src/network/networkd-link.c | 2 +- |
| 48 | src/network/networkd-network.c | 1 + |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 49 | src/network/test-network-tables.c | 1 + |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 50 | src/shared/ethtool-util.c | 1 + |
| 51 | src/shared/ethtool-util.h | 1 + |
| 52 | src/udev/net/link-config.c | 1 + |
| 53 | src/udev/udev-builtin-net_setup_link.c | 1 + |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 54 | 19 files changed, 18 insertions(+), 4 deletions(-) |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 55 | |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 56 | diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c |
| 57 | index 30ac526fc9..126077e13c 100644 |
| 58 | --- a/src/libsystemd-network/sd-dhcp6-client.c |
| 59 | +++ b/src/libsystemd-network/sd-dhcp6-client.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 60 | @@ -5,7 +5,6 @@ |
| 61 | |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 62 | #include <errno.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 63 | #include <sys/ioctl.h> |
| 64 | -#include <linux/if_arp.h> |
| 65 | #include <linux/if_infiniband.h> |
| 66 | |
| 67 | #include "sd-dhcp6-client.h" |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 68 | diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c |
| 69 | index 6fb6c147d9..8eda02d202 100644 |
| 70 | --- a/src/libsystemd/sd-netlink/netlink-types.c |
| 71 | +++ b/src/libsystemd/sd-netlink/netlink-types.c |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 72 | @@ -3,6 +3,7 @@ |
| 73 | #include <netinet/in.h> |
| 74 | #include <stdint.h> |
| 75 | #include <sys/socket.h> |
| 76 | +#include <netinet/if_ether.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 77 | #include <linux/can/vxcan.h> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 78 | #include <linux/netlink.h> |
| 79 | #include <linux/rtnetlink.h> |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 80 | diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c |
| 81 | index bb67beb665..f5780f1aec 100644 |
| 82 | --- a/src/machine/machine-dbus.c |
| 83 | +++ b/src/machine/machine-dbus.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 84 | @@ -3,6 +3,7 @@ |
| 85 | #include <errno.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 86 | #include <sys/mount.h> |
| 87 | #include <sys/wait.h> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 88 | +#include <netinet/if_ether.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 89 | |
| 90 | /* When we include libgen.h because we need dirname() we immediately |
| 91 | * undefine basename() since libgen.h defines it as a macro to the POSIX |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 92 | diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c |
| 93 | index e27f36067b..8868f1da5d 100644 |
| 94 | --- a/src/network/netdev/bond.c |
| 95 | +++ b/src/network/netdev/bond.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 96 | @@ -1,5 +1,6 @@ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 97 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 98 | |
| 99 | +#include <netinet/if_ether.h> |
| 100 | #include "alloc-util.h" |
| 101 | #include "bond.h" |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 102 | #include "bond-util.h" |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 103 | diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c |
| 104 | index 1f59cd8b42..5fdbae7e99 100644 |
| 105 | --- a/src/network/netdev/bridge.c |
| 106 | +++ b/src/network/netdev/bridge.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 107 | @@ -1,5 +1,6 @@ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 108 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 109 | |
| 110 | +#include <netinet/if_ether.h> |
| 111 | #include <net/if.h> |
| 112 | |
| 113 | #include "bridge.h" |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 114 | diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c |
| 115 | index 82e71c3920..fbae86e216 100644 |
| 116 | --- a/src/network/netdev/macsec.c |
| 117 | +++ b/src/network/netdev/macsec.c |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 118 | @@ -1,5 +1,6 @@ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 119 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 120 | |
| 121 | +#include <netinet/if_ether.h> |
| 122 | #include <netinet/in.h> |
| 123 | #include <linux/if_ether.h> |
| 124 | #include <linux/if_macsec.h> |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 125 | diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf |
| 126 | index 4e89761f2c..91251fa6ec 100644 |
| 127 | --- a/src/network/netdev/netdev-gperf.gperf |
| 128 | +++ b/src/network/netdev/netdev-gperf.gperf |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 129 | @@ -2,6 +2,7 @@ |
| 130 | #if __GNUC__ >= 7 |
| 131 | _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"") |
| 132 | #endif |
| 133 | +#include <netinet/if_ether.h> |
| 134 | #include <stddef.h> |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 135 | #include "bareudp.h" |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 136 | #include "bond.h" |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 137 | diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c |
| 138 | index 9f390b5781..62aeafb1e4 100644 |
| 139 | --- a/src/network/netdev/netdev.c |
| 140 | +++ b/src/network/netdev/netdev.c |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 141 | @@ -1,5 +1,6 @@ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 142 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 143 | |
| 144 | +#include <netinet/if_ether.h> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 145 | #include <net/if.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 146 | #include <netinet/in.h> |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 147 | #include <unistd.h> |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 148 | diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c |
| 149 | index e53c73c30c..9bf0771b84 100644 |
| 150 | --- a/src/network/networkd-brvlan.c |
| 151 | +++ b/src/network/networkd-brvlan.c |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 152 | @@ -4,6 +4,7 @@ |
| 153 | ***/ |
| 154 | |
| 155 | #include <netinet/in.h> |
| 156 | +#include <netinet/if_ether.h> |
| 157 | #include <linux/if_bridge.h> |
| 158 | #include <stdbool.h> |
| 159 | |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 160 | diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c |
| 161 | index c338c775a7..ab35d65c53 100644 |
| 162 | --- a/src/network/networkd-dhcp-common.c |
| 163 | +++ b/src/network/networkd-dhcp-common.c |
| 164 | @@ -1,7 +1,8 @@ |
| 165 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 166 | |
| 167 | #include <netinet/in.h> |
| 168 | -#include <linux/if_arp.h> |
| 169 | +#include <net/if_arp.h> |
| 170 | +#include <net/if.h> |
| 171 | |
| 172 | #include "dhcp-internal.h" |
| 173 | #include "dhcp6-internal.h" |
| 174 | @@ -10,6 +10,7 @@ |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 175 | #include "networkd-dhcp-common.h" |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 176 | #include "networkd-link.h" |
| 177 | #include "networkd-manager.h" |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 178 | +#include <netinet/if_ether.h> |
| 179 | #include "networkd-network.h" |
| 180 | #include "parse-util.h" |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 181 | #include "socket-util.h" |
| 182 | diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c |
| 183 | index cf279c640d..bae541029b 100644 |
| 184 | --- a/src/network/networkd-dhcp-server.c |
| 185 | +++ b/src/network/networkd-dhcp-server.c |
| 186 | @@ -1,8 +1,8 @@ |
| 187 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 188 | |
| 189 | #include <netinet/in.h> |
| 190 | -#include <linux/if_arp.h> |
| 191 | -#include <linux/if.h> |
| 192 | +#include <net/if_arp.h> |
| 193 | +#include <net/if.h> |
| 194 | |
| 195 | #include "sd-dhcp-server.h" |
| 196 | |
| 197 | diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c |
| 198 | index 02d33841b6..a30d8dd82c 100644 |
| 199 | --- a/src/network/networkd-dhcp4.c |
| 200 | +++ b/src/network/networkd-dhcp4.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 201 | @@ -1,9 +1,9 @@ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 202 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 203 | |
| 204 | +#include <netinet/if_ether.h> |
| 205 | #include <netinet/in.h> |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 206 | #include <netinet/ip.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 207 | #include <linux/if.h> |
| 208 | -#include <linux/if_arp.h> |
| 209 | |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 210 | #include "escape.h" |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 211 | #include "alloc-util.h" |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 212 | diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c |
| 213 | index d4d4182ee5..635d08f7d5 100644 |
| 214 | --- a/src/network/networkd-dhcp6.c |
| 215 | +++ b/src/network/networkd-dhcp6.c |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 216 | @@ -3,9 +3,9 @@ |
| 217 | Copyright © 2014 Intel Corporation. All rights reserved. |
| 218 | ***/ |
| 219 | |
| 220 | +#include <netinet/if_ether.h> |
| 221 | #include <netinet/in.h> |
| 222 | #include <linux/if.h> |
| 223 | -#include <linux/if_arp.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 224 | |
| 225 | #include "sd-dhcp6-client.h" |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 226 | |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 227 | diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c |
| 228 | index ced18de425..07b43770de 100644 |
| 229 | --- a/src/network/networkd-link.c |
| 230 | +++ b/src/network/networkd-link.c |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 231 | @@ -1,8 +1,8 @@ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 232 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 233 | |
| 234 | +#include <netinet/if_ether.h> |
| 235 | #include <netinet/in.h> |
| 236 | #include <linux/if.h> |
| 237 | -#include <linux/if_arp.h> |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 238 | #include <linux/if_link.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 239 | #include <unistd.h> |
| 240 | |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 241 | diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c |
| 242 | index 3254641461..f0ada419fd 100644 |
| 243 | --- a/src/network/networkd-network.c |
| 244 | +++ b/src/network/networkd-network.c |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 245 | @@ -1,5 +1,6 @@ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 246 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 247 | |
| 248 | +#include <netinet/if_ether.h> |
| 249 | #include <net/if.h> |
| 250 | #include <netinet/in.h> |
| 251 | #include <linux/netdevice.h> |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 252 | diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c |
| 253 | index 10f30c1a7e..579885726c 100644 |
| 254 | --- a/src/network/networkd-route.c |
| 255 | +++ b/src/network/networkd-route.c |
| 256 | @@ -1,7 +1,10 @@ |
| 257 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 258 | |
| 259 | #include <linux/icmpv6.h> |
| 260 | -#include <linux/ipv6_route.h> |
| 261 | +/* linux/ipv6_route.h conflicts with netinet/in.h so define manually */ |
| 262 | +#ifndef IP6_RT_PRIO_USER |
| 263 | +#define IP6_RT_PRIO_USER 1024 |
| 264 | +#endif |
| 265 | |
| 266 | #include "alloc-util.h" |
| 267 | #include "netlink-util.h" |
| 268 | diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c |
| 269 | index 475cac7527..9bae6eda16 100644 |
| 270 | --- a/src/network/test-network-tables.c |
| 271 | +++ b/src/network/test-network-tables.c |
| 272 | @@ -1,5 +1,6 @@ |
| 273 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 274 | |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 275 | +#include <netinet/if_ether.h> |
| 276 | #include "bond.h" |
| 277 | #include "dhcp6-internal.h" |
| 278 | #include "dhcp6-protocol.h" |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 279 | diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c |
| 280 | index e6fab262f2..41dd3d7df7 100644 |
| 281 | --- a/src/shared/ethtool-util.c |
| 282 | +++ b/src/shared/ethtool-util.c |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 283 | @@ -1,5 +1,6 @@ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 284 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 285 | |
| 286 | +#include <netinet/if_ether.h> |
| 287 | #include <net/if.h> |
| 288 | #include <sys/ioctl.h> |
| 289 | #include <linux/ethtool.h> |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 290 | diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h |
| 291 | index f94b3e15bf..08a7e4fa09 100644 |
| 292 | --- a/src/shared/ethtool-util.h |
| 293 | +++ b/src/shared/ethtool-util.h |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 294 | @@ -3,6 +3,7 @@ |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 295 | |
| 296 | #include <macro.h> |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 297 | #include <net/ethernet.h> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 298 | +#include <netinet/if_ether.h> |
| 299 | #include <linux/ethtool.h> |
| 300 | |
| 301 | #include "conf-parser.h" |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 302 | diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c |
| 303 | index d12fd0e299..636806dc23 100644 |
| 304 | --- a/src/udev/net/link-config.c |
| 305 | +++ b/src/udev/net/link-config.c |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 306 | @@ -1,5 +1,6 @@ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 307 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 308 | |
| 309 | +#include <netinet/if_ether.h> |
| 310 | #include <linux/netdevice.h> |
| 311 | #include <netinet/ether.h> |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 312 | #include <unistd.h> |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 313 | diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c |
| 314 | index cb12b943fe..5a28c8b563 100644 |
| 315 | --- a/src/udev/udev-builtin-net_setup_link.c |
| 316 | +++ b/src/udev/udev-builtin-net_setup_link.c |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 317 | @@ -1,5 +1,6 @@ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 318 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 319 | |
| 320 | +#include <netinet/if_ether.h> |
| 321 | #include "device-util.h" |
| 322 | #include "alloc-util.h" |
| 323 | #include "link-config.h" |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 324 | -- |
| 325 | 2.27.0 |
| 326 | |