Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 1 | From 47818052121d135632f5e46c369e3e4706a0f9e0 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 26 Oct 2017 22:10:42 -0700 |
| 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 | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 32 | |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 33 | --- |
| 34 | src/libsystemd-network/sd-dhcp6-client.c | 1 - |
| 35 | src/libsystemd/sd-netlink/netlink-types.c | 1 + |
| 36 | src/machine/machine-dbus.c | 1 + |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 37 | src/network/netdev/bond.c | 1 + |
| 38 | src/network/netdev/bridge.c | 1 + |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 39 | src/network/netdev/macsec.c | 1 + |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 40 | src/network/netdev/netdev-gperf.gperf | 1 + |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 41 | src/network/netdev/netdev.c | 1 + |
| 42 | src/network/networkd-brvlan.c | 1 + |
| 43 | src/network/networkd-dhcp-common.c | 1 + |
| 44 | src/network/networkd-dhcp4.c | 2 +- |
| 45 | src/network/networkd-dhcp6.c | 2 +- |
| 46 | src/network/networkd-link.c | 2 +- |
| 47 | src/network/networkd-network.c | 1 + |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 48 | src/network/test-network-tables.c | 1 + |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 49 | src/shared/ethtool-util.c | 1 + |
| 50 | src/shared/ethtool-util.h | 1 + |
| 51 | src/udev/net/link-config.c | 1 + |
| 52 | src/udev/udev-builtin-net_setup_link.c | 1 + |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 53 | 19 files changed, 18 insertions(+), 4 deletions(-) |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 54 | |
| 55 | diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 56 | index eac2e725cce7..1beae7ba91cc 100644 |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 57 | --- a/src/libsystemd-network/sd-dhcp6-client.c |
| 58 | +++ b/src/libsystemd-network/sd-dhcp6-client.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 59 | @@ -5,7 +5,6 @@ |
| 60 | |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 61 | #include <errno.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 62 | #include <sys/ioctl.h> |
| 63 | -#include <linux/if_arp.h> |
| 64 | #include <linux/if_infiniband.h> |
| 65 | |
| 66 | #include "sd-dhcp6-client.h" |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 67 | diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 68 | index e35127a4cd2e..4f6ad9ef5886 100644 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 69 | --- a/src/libsystemd/sd-netlink/netlink-types.c |
| 70 | +++ b/src/libsystemd/sd-netlink/netlink-types.c |
| 71 | @@ -3,6 +3,7 @@ |
| 72 | #include <netinet/in.h> |
| 73 | #include <stdint.h> |
| 74 | #include <sys/socket.h> |
| 75 | +#include <netinet/if_ether.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 76 | #include <linux/can/vxcan.h> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 77 | #include <linux/netlink.h> |
| 78 | #include <linux/rtnetlink.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 79 | diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 80 | index a2990452af17..5af350883c28 100644 |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 81 | --- a/src/machine/machine-dbus.c |
| 82 | +++ b/src/machine/machine-dbus.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 83 | @@ -3,6 +3,7 @@ |
| 84 | #include <errno.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 85 | #include <sys/mount.h> |
| 86 | #include <sys/wait.h> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 87 | +#include <netinet/if_ether.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 88 | |
| 89 | /* When we include libgen.h because we need dirname() we immediately |
| 90 | * undefine basename() since libgen.h defines it as a macro to the POSIX |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 91 | diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c |
| 92 | index 8df39e35843f..8d697894f970 100644 |
| 93 | --- a/src/network/netdev/bond.c |
| 94 | +++ b/src/network/netdev/bond.c |
| 95 | @@ -1,5 +1,6 @@ |
| 96 | /* SPDX-License-Identifier: LGPL-2.1+ */ |
| 97 | |
| 98 | +#include <netinet/if_ether.h> |
| 99 | #include "alloc-util.h" |
| 100 | #include "bond.h" |
| 101 | #include "conf-parser.h" |
| 102 | diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c |
| 103 | index 6b8f9944612e..7f81ec25c407 100644 |
| 104 | --- a/src/network/netdev/bridge.c |
| 105 | +++ b/src/network/netdev/bridge.c |
| 106 | @@ -1,5 +1,6 @@ |
| 107 | /* SPDX-License-Identifier: LGPL-2.1+ */ |
| 108 | |
| 109 | +#include <netinet/if_ether.h> |
| 110 | #include <net/if.h> |
| 111 | |
| 112 | #include "bridge.h" |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 113 | diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 114 | index 7d1fec3afe6d..e948a335336d 100644 |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 115 | --- a/src/network/netdev/macsec.c |
| 116 | +++ b/src/network/netdev/macsec.c |
| 117 | @@ -1,5 +1,6 @@ |
| 118 | /* SPDX-License-Identifier: LGPL-2.1+ */ |
| 119 | |
| 120 | +#include <netinet/if_ether.h> |
| 121 | #include <netinet/in.h> |
| 122 | #include <linux/if_ether.h> |
| 123 | #include <linux/if_macsec.h> |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 124 | diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf |
| 125 | index 09a5f4822e03..873299b1f98a 100644 |
| 126 | --- a/src/network/netdev/netdev-gperf.gperf |
| 127 | +++ b/src/network/netdev/netdev-gperf.gperf |
| 128 | @@ -2,6 +2,7 @@ |
| 129 | #if __GNUC__ >= 7 |
| 130 | _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"") |
| 131 | #endif |
| 132 | +#include <netinet/if_ether.h> |
| 133 | #include <stddef.h> |
| 134 | #include "bond.h" |
| 135 | #include "bridge.h" |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 136 | diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 137 | index f8121a48ed92..437f411c61e8 100644 |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 138 | --- a/src/network/netdev/netdev.c |
| 139 | +++ b/src/network/netdev/netdev.c |
| 140 | @@ -1,5 +1,6 @@ |
| 141 | /* SPDX-License-Identifier: LGPL-2.1+ */ |
| 142 | |
| 143 | +#include <netinet/if_ether.h> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 144 | #include <net/if.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 145 | #include <netinet/in.h> |
| 146 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 147 | diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 148 | index 41f09287f2b7..b67ce4fc8844 100644 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 149 | --- a/src/network/networkd-brvlan.c |
| 150 | +++ b/src/network/networkd-brvlan.c |
| 151 | @@ -4,6 +4,7 @@ |
| 152 | ***/ |
| 153 | |
| 154 | #include <netinet/in.h> |
| 155 | +#include <netinet/if_ether.h> |
| 156 | #include <linux/if_bridge.h> |
| 157 | #include <stdbool.h> |
| 158 | |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 159 | diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 160 | index 8664d8cdc0d4..e9f91f74c1a1 100644 |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 161 | --- a/src/network/networkd-dhcp-common.c |
| 162 | +++ b/src/network/networkd-dhcp-common.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 163 | @@ -4,6 +4,7 @@ |
| 164 | #include "escape.h" |
| 165 | #include "in-addr-util.h" |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 166 | #include "networkd-dhcp-common.h" |
| 167 | +#include <netinet/if_ether.h> |
| 168 | #include "networkd-network.h" |
| 169 | #include "parse-util.h" |
| 170 | #include "string-table.h" |
| 171 | diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 172 | index 13e3e32f40e8..5394399c9150 100644 |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 173 | --- a/src/network/networkd-dhcp4.c |
| 174 | +++ b/src/network/networkd-dhcp4.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 175 | @@ -1,9 +1,9 @@ |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 176 | /* SPDX-License-Identifier: LGPL-2.1+ */ |
| 177 | |
| 178 | +#include <netinet/if_ether.h> |
| 179 | #include <netinet/in.h> |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 180 | #include <netinet/ip.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 181 | #include <linux/if.h> |
| 182 | -#include <linux/if_arp.h> |
| 183 | |
| 184 | #include "alloc-util.h" |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 185 | #include "dhcp-client-internal.h" |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 186 | diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 187 | index 7304270c60b1..099064f64715 100644 |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 188 | --- a/src/network/networkd-dhcp6.c |
| 189 | +++ b/src/network/networkd-dhcp6.c |
| 190 | @@ -3,9 +3,9 @@ |
| 191 | Copyright © 2014 Intel Corporation. All rights reserved. |
| 192 | ***/ |
| 193 | |
| 194 | +#include <netinet/if_ether.h> |
| 195 | #include <netinet/in.h> |
| 196 | #include <linux/if.h> |
| 197 | -#include <linux/if_arp.h> |
| 198 | #include "sd-radv.h" |
| 199 | |
| 200 | #include "sd-dhcp6-client.h" |
| 201 | diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 202 | index 99d4b29c31ec..e8b467d6ac09 100644 |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 203 | --- a/src/network/networkd-link.c |
| 204 | +++ b/src/network/networkd-link.c |
| 205 | @@ -1,8 +1,8 @@ |
| 206 | /* SPDX-License-Identifier: LGPL-2.1+ */ |
| 207 | |
| 208 | +#include <netinet/if_ether.h> |
| 209 | #include <netinet/in.h> |
| 210 | #include <linux/if.h> |
| 211 | -#include <linux/if_arp.h> |
| 212 | #include <unistd.h> |
| 213 | |
| 214 | #include "alloc-util.h" |
| 215 | diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 216 | index 2e716b291e97..56f18cea57fe 100644 |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 217 | --- a/src/network/networkd-network.c |
| 218 | +++ b/src/network/networkd-network.c |
| 219 | @@ -1,5 +1,6 @@ |
| 220 | /* SPDX-License-Identifier: LGPL-2.1+ */ |
| 221 | |
| 222 | +#include <netinet/if_ether.h> |
| 223 | #include <net/if.h> |
| 224 | #include <netinet/in.h> |
| 225 | #include <linux/netdevice.h> |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 226 | diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c |
| 227 | index 25b939639775..530e4928835c 100644 |
| 228 | --- a/src/network/test-network-tables.c |
| 229 | +++ b/src/network/test-network-tables.c |
| 230 | @@ -1,3 +1,4 @@ |
| 231 | +#include <netinet/if_ether.h> |
| 232 | #include "bond.h" |
| 233 | #include "dhcp6-internal.h" |
| 234 | #include "dhcp6-protocol.h" |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 235 | diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 236 | index 00a71d64a638..4593e89120b8 100644 |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 237 | --- a/src/shared/ethtool-util.c |
| 238 | +++ b/src/shared/ethtool-util.c |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 239 | @@ -1,5 +1,6 @@ |
| 240 | /* SPDX-License-Identifier: LGPL-2.1+ */ |
| 241 | |
| 242 | +#include <netinet/if_ether.h> |
| 243 | #include <net/if.h> |
| 244 | #include <sys/ioctl.h> |
| 245 | #include <linux/ethtool.h> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 246 | diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 247 | index c1d5d7590ef9..b3e018bf76e9 100644 |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 248 | --- a/src/shared/ethtool-util.h |
| 249 | +++ b/src/shared/ethtool-util.h |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 250 | @@ -3,6 +3,7 @@ |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 251 | |
| 252 | #include <macro.h> |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 253 | #include <net/ethernet.h> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 254 | +#include <netinet/if_ether.h> |
| 255 | #include <linux/ethtool.h> |
| 256 | |
| 257 | #include "conf-parser.h" |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 258 | diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 259 | index 0332e99269c9..ff3aead4a779 100644 |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 260 | --- a/src/udev/net/link-config.c |
| 261 | +++ b/src/udev/net/link-config.c |
| 262 | @@ -1,5 +1,6 @@ |
| 263 | /* SPDX-License-Identifier: LGPL-2.1+ */ |
| 264 | |
| 265 | +#include <netinet/if_ether.h> |
| 266 | #include <linux/netdevice.h> |
| 267 | #include <netinet/ether.h> |
| 268 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 269 | diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 270 | index ee3ca9fa3846..9aa4e828741f 100644 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 271 | --- a/src/udev/udev-builtin-net_setup_link.c |
| 272 | +++ b/src/udev/udev-builtin-net_setup_link.c |
| 273 | @@ -1,5 +1,6 @@ |
| 274 | /* SPDX-License-Identifier: LGPL-2.1+ */ |
| 275 | |
| 276 | +#include <netinet/if_ether.h> |
| 277 | #include "device-util.h" |
| 278 | #include "alloc-util.h" |
| 279 | #include "link-config.h" |