| From d3ed0da271738fd0fc3d3e4d82d6f5810334b05e Mon Sep 17 00:00:00 2001 |
| From: Khem Raj <raj.khem@gmail.com> |
| Date: Thu, 26 Oct 2017 22:10:42 -0700 |
| Subject: [PATCH 06/26] Include netinet/if_ether.h |
| |
| Fixes |
| /path/to/systemd/recipe-sysroot/usr/include/netinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr' |
| struct ethhdr { |
| ^~~~~~ |
| |
| and related arphdr, arpreq, and arpreq_old errors |
| /path/to/systemd/recipe-sysroot/usr/include/net/if_arp.h:22:8: error: redefinition of 'struct arphdr' |
| struct arphdr { |
| ^~~~~~ |
| |
| The latter requires removing some includes of net/if_arp.h to avoid |
| conflicting with netinet/if_ether.h. |
| |
| Upstream-Status: Inappropriate [musl specific] |
| |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
| [rebased for systemd 243] |
| Signed-off-by: Scott Murray <scott.murray@konsulko.com> |
| |
| Upstream-Status: Inappropriate [musl specific] |
| |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
| [rebased for systemd 243] |
| Signed-off-by: Scott Murray <scott.murray@konsulko.com> |
| [rebased for systemd 247] |
| Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> |
| --- |
| src/libsystemd-network/sd-dhcp6-client.c | 1 - |
| src/libsystemd/sd-netlink/netlink-types.c | 1 + |
| src/machine/machine-dbus.c | 1 + |
| src/network/netdev/bond.c | 1 + |
| src/network/netdev/bridge.c | 1 + |
| src/network/netdev/macsec.c | 1 + |
| src/network/netdev/netdev-gperf.gperf | 1 + |
| src/network/netdev/netdev.c | 1 + |
| src/network/networkd-brvlan.c | 1 + |
| src/network/networkd-dhcp-common.c | 4 +++- |
| src/network/networkd-dhcp-server.c | 4 ++-- |
| src/network/networkd-dhcp4.c | 2 +- |
| src/network/networkd-dhcp6.c | 2 +- |
| src/network/networkd-link.c | 2 +- |
| src/network/networkd-network.c | 1 + |
| src/network/networkd-route.c | 5 ++++- |
| src/network/test-network-tables.c | 1 + |
| src/shared/ethtool-util.c | 1 + |
| src/shared/ethtool-util.h | 1 + |
| src/udev/net/link-config.c | 1 + |
| src/udev/udev-builtin-net_setup_link.c | 1 + |
| 21 files changed, 26 insertions(+), 8 deletions(-) |
| |
| diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c |
| index 66f87c4b95..de1264ae46 100644 |
| --- a/src/libsystemd-network/sd-dhcp6-client.c |
| +++ b/src/libsystemd-network/sd-dhcp6-client.c |
| @@ -5,7 +5,6 @@ |
| |
| #include <errno.h> |
| #include <sys/ioctl.h> |
| -#include <linux/if_arp.h> |
| #include <linux/if_infiniband.h> |
| |
| #include "sd-dhcp6-client.h" |
| diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c |
| index 6fb6c147d9..8eda02d202 100644 |
| --- a/src/libsystemd/sd-netlink/netlink-types.c |
| +++ b/src/libsystemd/sd-netlink/netlink-types.c |
| @@ -3,6 +3,7 @@ |
| #include <netinet/in.h> |
| #include <stdint.h> |
| #include <sys/socket.h> |
| +#include <netinet/if_ether.h> |
| #include <linux/can/vxcan.h> |
| #include <linux/netlink.h> |
| #include <linux/rtnetlink.h> |
| diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c |
| index bb67beb665..f5780f1aec 100644 |
| --- a/src/machine/machine-dbus.c |
| +++ b/src/machine/machine-dbus.c |
| @@ -3,6 +3,7 @@ |
| #include <errno.h> |
| #include <sys/mount.h> |
| #include <sys/wait.h> |
| +#include <netinet/if_ether.h> |
| |
| /* When we include libgen.h because we need dirname() we immediately |
| * undefine basename() since libgen.h defines it as a macro to the POSIX |
| diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c |
| index e27f36067b..8868f1da5d 100644 |
| --- a/src/network/netdev/bond.c |
| +++ b/src/network/netdev/bond.c |
| @@ -1,5 +1,6 @@ |
| /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| |
| +#include <netinet/if_ether.h> |
| #include "alloc-util.h" |
| #include "bond.h" |
| #include "bond-util.h" |
| diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c |
| index 1f59cd8b42..5fdbae7e99 100644 |
| --- a/src/network/netdev/bridge.c |
| +++ b/src/network/netdev/bridge.c |
| @@ -1,5 +1,6 @@ |
| /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| |
| +#include <netinet/if_ether.h> |
| #include <net/if.h> |
| |
| #include "bridge.h" |
| diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c |
| index 82e71c3920..fbae86e216 100644 |
| --- a/src/network/netdev/macsec.c |
| +++ b/src/network/netdev/macsec.c |
| @@ -1,5 +1,6 @@ |
| /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| |
| +#include <netinet/if_ether.h> |
| #include <netinet/in.h> |
| #include <linux/if_ether.h> |
| #include <linux/if_macsec.h> |
| diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf |
| index 4e89761f2c..91251fa6ec 100644 |
| --- a/src/network/netdev/netdev-gperf.gperf |
| +++ b/src/network/netdev/netdev-gperf.gperf |
| @@ -2,6 +2,7 @@ |
| #if __GNUC__ >= 7 |
| _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"") |
| #endif |
| +#include <netinet/if_ether.h> |
| #include <stddef.h> |
| #include "bareudp.h" |
| #include "bond.h" |
| diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c |
| index 9f390b5781..62aeafb1e4 100644 |
| --- a/src/network/netdev/netdev.c |
| +++ b/src/network/netdev/netdev.c |
| @@ -1,5 +1,6 @@ |
| /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| |
| +#include <netinet/if_ether.h> |
| #include <net/if.h> |
| #include <netinet/in.h> |
| #include <unistd.h> |
| diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c |
| index e53c73c30c..9bf0771b84 100644 |
| --- a/src/network/networkd-brvlan.c |
| +++ b/src/network/networkd-brvlan.c |
| @@ -4,6 +4,7 @@ |
| ***/ |
| |
| #include <netinet/in.h> |
| +#include <netinet/if_ether.h> |
| #include <linux/if_bridge.h> |
| #include <stdbool.h> |
| |
| diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c |
| index 9f58121350..554d006cb8 100644 |
| --- a/src/network/networkd-dhcp-common.c |
| +++ b/src/network/networkd-dhcp-common.c |
| @@ -1,7 +1,8 @@ |
| /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| |
| #include <netinet/in.h> |
| -#include <linux/if_arp.h> |
| +#include <net/if_arp.h> |
| +#include <net/if.h> |
| |
| #include "dhcp-internal.h" |
| #include "dhcp6-internal.h" |
| @@ -10,6 +11,7 @@ |
| #include "networkd-dhcp-common.h" |
| #include "networkd-link.h" |
| #include "networkd-manager.h" |
| +#include <netinet/if_ether.h> |
| #include "networkd-network.h" |
| #include "parse-util.h" |
| #include "socket-util.h" |
| diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c |
| index cf279c640d..bae541029b 100644 |
| --- a/src/network/networkd-dhcp-server.c |
| +++ b/src/network/networkd-dhcp-server.c |
| @@ -1,8 +1,8 @@ |
| /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| |
| #include <netinet/in.h> |
| -#include <linux/if_arp.h> |
| -#include <linux/if.h> |
| +#include <net/if_arp.h> |
| +#include <net/if.h> |
| |
| #include "sd-dhcp-server.h" |
| |
| diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c |
| index f3c1e5f609..e4ef6eca63 100644 |
| --- a/src/network/networkd-dhcp4.c |
| +++ b/src/network/networkd-dhcp4.c |
| @@ -1,9 +1,9 @@ |
| /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| |
| +#include <netinet/if_ether.h> |
| #include <netinet/in.h> |
| #include <netinet/ip.h> |
| #include <linux/if.h> |
| -#include <linux/if_arp.h> |
| |
| #include "escape.h" |
| #include "alloc-util.h" |
| diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c |
| index 5c077c1ec8..fa98042aa5 100644 |
| --- a/src/network/networkd-dhcp6.c |
| +++ b/src/network/networkd-dhcp6.c |
| @@ -3,9 +3,9 @@ |
| Copyright © 2014 Intel Corporation. All rights reserved. |
| ***/ |
| |
| +#include <netinet/if_ether.h> |
| #include <netinet/in.h> |
| #include <linux/if.h> |
| -#include <linux/if_arp.h> |
| |
| #include "sd-dhcp6-client.h" |
| |
| diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c |
| index 3bfe636691..e0c68c8ad3 100644 |
| --- a/src/network/networkd-link.c |
| +++ b/src/network/networkd-link.c |
| @@ -1,8 +1,8 @@ |
| /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| |
| +#include <netinet/if_ether.h> |
| #include <netinet/in.h> |
| #include <linux/if.h> |
| -#include <linux/if_arp.h> |
| #include <linux/if_link.h> |
| #include <unistd.h> |
| |
| diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c |
| index 3254641461..f0ada419fd 100644 |
| --- a/src/network/networkd-network.c |
| +++ b/src/network/networkd-network.c |
| @@ -1,5 +1,6 @@ |
| /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| |
| +#include <netinet/if_ether.h> |
| #include <net/if.h> |
| #include <netinet/in.h> |
| #include <linux/netdevice.h> |
| diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c |
| index 0ed89584ef..e7e157c201 100644 |
| --- a/src/network/networkd-route.c |
| +++ b/src/network/networkd-route.c |
| @@ -1,7 +1,10 @@ |
| /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| |
| #include <linux/icmpv6.h> |
| -#include <linux/ipv6_route.h> |
| +/* linux/ipv6_route.h conflicts with netinet/in.h so define manually */ |
| +#ifndef IP6_RT_PRIO_USER |
| +#define IP6_RT_PRIO_USER 1024 |
| +#endif |
| |
| #include "alloc-util.h" |
| #include "netlink-util.h" |
| diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c |
| index 475cac7527..9bae6eda16 100644 |
| --- a/src/network/test-network-tables.c |
| +++ b/src/network/test-network-tables.c |
| @@ -1,5 +1,6 @@ |
| /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| |
| +#include <netinet/if_ether.h> |
| #include "bond.h" |
| #include "dhcp6-internal.h" |
| #include "dhcp6-protocol.h" |
| diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c |
| index e6fab262f2..41dd3d7df7 100644 |
| --- a/src/shared/ethtool-util.c |
| +++ b/src/shared/ethtool-util.c |
| @@ -1,5 +1,6 @@ |
| /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| |
| +#include <netinet/if_ether.h> |
| #include <net/if.h> |
| #include <sys/ioctl.h> |
| #include <linux/ethtool.h> |
| diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h |
| index f94b3e15bf..08a7e4fa09 100644 |
| --- a/src/shared/ethtool-util.h |
| +++ b/src/shared/ethtool-util.h |
| @@ -3,6 +3,7 @@ |
| |
| #include <macro.h> |
| #include <net/ethernet.h> |
| +#include <netinet/if_ether.h> |
| #include <linux/ethtool.h> |
| |
| #include "conf-parser.h" |
| diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c |
| index d12fd0e299..636806dc23 100644 |
| --- a/src/udev/net/link-config.c |
| +++ b/src/udev/net/link-config.c |
| @@ -1,5 +1,6 @@ |
| /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| |
| +#include <netinet/if_ether.h> |
| #include <linux/netdevice.h> |
| #include <netinet/ether.h> |
| #include <unistd.h> |
| diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c |
| index 87e1fb133e..13876029d0 100644 |
| --- a/src/udev/udev-builtin-net_setup_link.c |
| +++ b/src/udev/udev-builtin-net_setup_link.c |
| @@ -1,5 +1,6 @@ |
| /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| |
| +#include <netinet/if_ether.h> |
| #include "alloc-util.h" |
| #include "device-util.h" |
| #include "errno-util.h" |
| -- |
| 2.25.1 |
| |