William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 1 | From 2069f0b0d5ab8f869aeba635a347e0b11d362b30 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 |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 4 | Subject: [PATCH] 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> |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 34 | |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 35 | --- |
| 36 | src/libsystemd-network/sd-dhcp6-client.c | 1 - |
| 37 | src/libsystemd/sd-netlink/netlink-types.c | 1 + |
| 38 | src/machine/machine-dbus.c | 1 + |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 39 | src/network/netdev/bond.c | 1 + |
| 40 | src/network/netdev/bridge.c | 1 + |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 41 | src/network/netdev/macsec.c | 1 + |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 42 | src/network/netdev/netdev-gperf.gperf | 1 + |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 43 | src/network/netdev/netdev.c | 1 + |
| 44 | src/network/networkd-brvlan.c | 1 + |
Andrew Geissler | 95ac1b8 | 2021-03-31 14:34:31 -0500 | [diff] [blame] | 45 | src/network/networkd-dhcp-common.c | 4 +++- |
| 46 | src/network/networkd-dhcp-server.c | 4 ++-- |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 47 | src/network/networkd-dhcp4.c | 2 +- |
| 48 | src/network/networkd-dhcp6.c | 2 +- |
| 49 | src/network/networkd-link.c | 2 +- |
| 50 | src/network/networkd-network.c | 1 + |
Andrew Geissler | 95ac1b8 | 2021-03-31 14:34:31 -0500 | [diff] [blame] | 51 | src/network/networkd-route.c | 5 ++++- |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 52 | src/network/test-network-tables.c | 1 + |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 53 | src/shared/ethtool-util.c | 1 + |
| 54 | src/shared/ethtool-util.h | 1 + |
| 55 | src/udev/net/link-config.c | 1 + |
| 56 | src/udev/udev-builtin-net_setup_link.c | 1 + |
Andrew Geissler | 95ac1b8 | 2021-03-31 14:34:31 -0500 | [diff] [blame] | 57 | 21 files changed, 26 insertions(+), 8 deletions(-) |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 58 | |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 59 | diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 60 | index 410bfda10e..e70ed8be92 100644 |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 61 | --- a/src/libsystemd-network/sd-dhcp6-client.c |
| 62 | +++ b/src/libsystemd-network/sd-dhcp6-client.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 63 | @@ -5,7 +5,6 @@ |
| 64 | |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 65 | #include <errno.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 66 | #include <sys/ioctl.h> |
| 67 | -#include <linux/if_arp.h> |
| 68 | #include <linux/if_infiniband.h> |
| 69 | |
| 70 | #include "sd-dhcp6-client.h" |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 71 | diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 72 | index ed7b9a8cd1..112c0b09e4 100644 |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 73 | --- a/src/libsystemd/sd-netlink/netlink-types.c |
| 74 | +++ b/src/libsystemd/sd-netlink/netlink-types.c |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 75 | @@ -3,6 +3,7 @@ |
| 76 | #include <netinet/in.h> |
| 77 | #include <stdint.h> |
| 78 | #include <sys/socket.h> |
| 79 | +#include <netinet/if_ether.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 80 | #include <linux/can/vxcan.h> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 81 | #include <linux/netlink.h> |
| 82 | #include <linux/rtnetlink.h> |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 83 | diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 84 | index e7c4ed3c7c..3a1e4f9072 100644 |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 85 | --- a/src/machine/machine-dbus.c |
| 86 | +++ b/src/machine/machine-dbus.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 87 | @@ -3,6 +3,7 @@ |
| 88 | #include <errno.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 89 | #include <sys/mount.h> |
| 90 | #include <sys/wait.h> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 91 | +#include <netinet/if_ether.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 92 | |
| 93 | /* When we include libgen.h because we need dirname() we immediately |
| 94 | * 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] | 95 | diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 96 | index cf7ca88d6f..34ab468191 100644 |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 97 | --- a/src/network/netdev/bond.c |
| 98 | +++ b/src/network/netdev/bond.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 99 | @@ -1,5 +1,6 @@ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 100 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 101 | |
| 102 | +#include <netinet/if_ether.h> |
| 103 | #include "alloc-util.h" |
| 104 | #include "bond.h" |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 105 | #include "bond-util.h" |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 106 | diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 107 | index 38432f1578..79ccfe578e 100644 |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 108 | --- a/src/network/netdev/bridge.c |
| 109 | +++ b/src/network/netdev/bridge.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 110 | @@ -1,5 +1,6 @@ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 111 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 112 | |
| 113 | +#include <netinet/if_ether.h> |
| 114 | #include <net/if.h> |
| 115 | |
| 116 | #include "bridge.h" |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 117 | diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 118 | index 77c5f8c4e7..04be1b4ab2 100644 |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 119 | --- a/src/network/netdev/macsec.c |
| 120 | +++ b/src/network/netdev/macsec.c |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 121 | @@ -1,5 +1,6 @@ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 122 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 123 | |
| 124 | +#include <netinet/if_ether.h> |
| 125 | #include <netinet/in.h> |
| 126 | #include <linux/if_ether.h> |
| 127 | #include <linux/if_macsec.h> |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 128 | diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 129 | index 8abe044890..3c54c58928 100644 |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 130 | --- a/src/network/netdev/netdev-gperf.gperf |
| 131 | +++ b/src/network/netdev/netdev-gperf.gperf |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 132 | @@ -3,6 +3,7 @@ |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 133 | #if __GNUC__ >= 7 |
| 134 | _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"") |
| 135 | #endif |
| 136 | +#include <netinet/if_ether.h> |
| 137 | #include <stddef.h> |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 138 | #include "bareudp.h" |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 139 | #include "batadv.h" |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 140 | diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 141 | index b31f0fa81a..c80e1ff537 100644 |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 142 | --- a/src/network/netdev/netdev.c |
| 143 | +++ b/src/network/netdev/netdev.c |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 144 | @@ -1,5 +1,6 @@ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 145 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 146 | |
| 147 | +#include <netinet/if_ether.h> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 148 | #include <net/if.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 149 | #include <netinet/in.h> |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 150 | #include <unistd.h> |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 151 | diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 152 | index 2847b336c9..4d6af8c642 100644 |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 153 | --- a/src/network/networkd-brvlan.c |
| 154 | +++ b/src/network/networkd-brvlan.c |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 155 | @@ -4,6 +4,7 @@ |
| 156 | ***/ |
| 157 | |
| 158 | #include <netinet/in.h> |
| 159 | +#include <netinet/if_ether.h> |
| 160 | #include <linux/if_bridge.h> |
| 161 | #include <stdbool.h> |
| 162 | |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 163 | diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 164 | index 00d055cf8d..65821c1d31 100644 |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 165 | --- a/src/network/networkd-dhcp-common.c |
| 166 | +++ b/src/network/networkd-dhcp-common.c |
| 167 | @@ -1,7 +1,8 @@ |
| 168 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 169 | |
| 170 | #include <netinet/in.h> |
| 171 | -#include <linux/if_arp.h> |
| 172 | +#include <net/if_arp.h> |
| 173 | +#include <net/if.h> |
| 174 | |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 175 | #include "bus-error.h" |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 176 | #include "dhcp-internal.h" |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 177 | @@ -11,6 +12,7 @@ |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 178 | #include "networkd-dhcp-common.h" |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 179 | #include "networkd-link.h" |
| 180 | #include "networkd-manager.h" |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 181 | +#include <netinet/if_ether.h> |
| 182 | #include "networkd-network.h" |
| 183 | #include "parse-util.h" |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 184 | #include "socket-util.h" |
| 185 | diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 186 | index 5cdf432c27..93cffb9863 100644 |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 187 | --- a/src/network/networkd-dhcp-server.c |
| 188 | +++ b/src/network/networkd-dhcp-server.c |
| 189 | @@ -1,8 +1,8 @@ |
| 190 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 191 | |
| 192 | #include <netinet/in.h> |
| 193 | -#include <linux/if_arp.h> |
| 194 | -#include <linux/if.h> |
| 195 | +#include <net/if_arp.h> |
| 196 | +#include <net/if.h> |
| 197 | |
| 198 | #include "sd-dhcp-server.h" |
| 199 | |
| 200 | diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 201 | index 23dc3a45db..7ae6c2467a 100644 |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 202 | --- a/src/network/networkd-dhcp4.c |
| 203 | +++ b/src/network/networkd-dhcp4.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 204 | @@ -1,9 +1,9 @@ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 205 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 206 | |
| 207 | +#include <netinet/if_ether.h> |
| 208 | #include <netinet/in.h> |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 209 | #include <netinet/ip.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 210 | #include <linux/if.h> |
| 211 | -#include <linux/if_arp.h> |
| 212 | |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 213 | #include "escape.h" |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 214 | #include "alloc-util.h" |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 215 | diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 216 | index aa077d6219..4f6ce22059 100644 |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 217 | --- a/src/network/networkd-dhcp6.c |
| 218 | +++ b/src/network/networkd-dhcp6.c |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 219 | @@ -3,9 +3,9 @@ |
| 220 | Copyright © 2014 Intel Corporation. All rights reserved. |
| 221 | ***/ |
| 222 | |
| 223 | +#include <netinet/if_ether.h> |
| 224 | #include <netinet/in.h> |
| 225 | #include <linux/if.h> |
| 226 | -#include <linux/if_arp.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 227 | |
| 228 | #include "sd-dhcp6-client.h" |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 229 | |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 230 | diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 231 | index 8219d95b0d..c92230453b 100644 |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 232 | --- a/src/network/networkd-link.c |
| 233 | +++ b/src/network/networkd-link.c |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 234 | @@ -1,8 +1,8 @@ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 235 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 236 | |
| 237 | +#include <netinet/if_ether.h> |
| 238 | #include <netinet/in.h> |
| 239 | #include <linux/if.h> |
| 240 | -#include <linux/if_arp.h> |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 241 | #include <linux/if_link.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 242 | #include <unistd.h> |
| 243 | |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 244 | diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 245 | index e5ffd35b6f..871ebb32c6 100644 |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 246 | --- a/src/network/networkd-network.c |
| 247 | +++ b/src/network/networkd-network.c |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 248 | @@ -1,5 +1,6 @@ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 249 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 250 | |
| 251 | +#include <netinet/if_ether.h> |
| 252 | #include <net/if.h> |
| 253 | #include <netinet/in.h> |
| 254 | #include <linux/netdevice.h> |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 255 | diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 256 | index a74541a6c9..a10549b336 100644 |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 257 | --- a/src/network/networkd-route.c |
| 258 | +++ b/src/network/networkd-route.c |
| 259 | @@ -1,7 +1,10 @@ |
| 260 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 261 | |
| 262 | #include <linux/icmpv6.h> |
| 263 | -#include <linux/ipv6_route.h> |
| 264 | +/* linux/ipv6_route.h conflicts with netinet/in.h so define manually */ |
| 265 | +#ifndef IP6_RT_PRIO_USER |
| 266 | +#define IP6_RT_PRIO_USER 1024 |
| 267 | +#endif |
| 268 | |
| 269 | #include "alloc-util.h" |
| 270 | #include "netlink-util.h" |
| 271 | diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 272 | index ce34449554..0b5dc01182 100644 |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 273 | --- a/src/network/test-network-tables.c |
| 274 | +++ b/src/network/test-network-tables.c |
| 275 | @@ -1,5 +1,6 @@ |
| 276 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| 277 | |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 278 | +#include <netinet/if_ether.h> |
| 279 | #include "bond.h" |
| 280 | #include "dhcp6-internal.h" |
| 281 | #include "dhcp6-protocol.h" |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 282 | diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 283 | index 654d36a83a..f4ed42d543 100644 |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 284 | --- a/src/shared/ethtool-util.c |
| 285 | +++ b/src/shared/ethtool-util.c |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 286 | @@ -1,5 +1,6 @@ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 287 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 288 | |
| 289 | +#include <netinet/if_ether.h> |
| 290 | #include <net/if.h> |
| 291 | #include <sys/ioctl.h> |
| 292 | #include <linux/ethtool.h> |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 293 | diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 294 | index 11e2906681..a171df0737 100644 |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 295 | --- a/src/shared/ethtool-util.h |
| 296 | +++ b/src/shared/ethtool-util.h |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 297 | @@ -3,6 +3,7 @@ |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 298 | |
| 299 | #include <macro.h> |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 300 | #include <net/ethernet.h> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 301 | +#include <netinet/if_ether.h> |
| 302 | #include <linux/ethtool.h> |
| 303 | |
| 304 | #include "conf-parser.h" |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 305 | diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 306 | index 31e5d0cd67..f25f821364 100644 |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 307 | --- a/src/udev/net/link-config.c |
| 308 | +++ b/src/udev/net/link-config.c |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 309 | @@ -1,5 +1,6 @@ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 310 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 311 | |
| 312 | +#include <netinet/if_ether.h> |
| 313 | #include <linux/netdevice.h> |
| 314 | #include <netinet/ether.h> |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 315 | #include <unistd.h> |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 316 | diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c |
Andrew Geissler | 95ac1b8 | 2021-03-31 14:34:31 -0500 | [diff] [blame] | 317 | index 87e1fb133e..13876029d0 100644 |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 318 | --- a/src/udev/udev-builtin-net_setup_link.c |
| 319 | +++ b/src/udev/udev-builtin-net_setup_link.c |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 320 | @@ -1,5 +1,6 @@ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 321 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 322 | |
| 323 | +#include <netinet/if_ether.h> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 324 | #include "alloc-util.h" |
Andrew Geissler | 95ac1b8 | 2021-03-31 14:34:31 -0500 | [diff] [blame] | 325 | #include "device-util.h" |
| 326 | #include "errno-util.h" |