Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 1 | From 67a988ae82c776d11be76de7180d50ea027ac442 Mon Sep 17 00:00:00 2001 |
| 2 | From: Chen Qi <Qi.Chen@windriver.com> |
| 3 | Date: Mon, 25 Feb 2019 14:24:20 +0800 |
| 4 | Subject: [PATCH 06/24] Include netinet/if_ether.h |
| 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 | |
| 11 | Upstream-Status: Inappropriate [musl specific] |
| 12 | |
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 14 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
| 15 | --- |
| 16 | src/libsystemd/sd-netlink/netlink-types.c | 1 + |
| 17 | src/network/netdev/tuntap.c | 1 + |
| 18 | src/network/networkd-brvlan.c | 1 + |
| 19 | src/udev/net/ethtool-util.c | 1 + |
| 20 | src/udev/net/ethtool-util.h | 1 + |
| 21 | src/udev/udev-builtin-net_setup_link.c | 1 + |
| 22 | 6 files changed, 6 insertions(+) |
| 23 | |
| 24 | diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c |
| 25 | index 9dcd3f2..e23ff4c 100644 |
| 26 | --- a/src/libsystemd/sd-netlink/netlink-types.c |
| 27 | +++ b/src/libsystemd/sd-netlink/netlink-types.c |
| 28 | @@ -3,6 +3,7 @@ |
| 29 | #include <netinet/in.h> |
| 30 | #include <stdint.h> |
| 31 | #include <sys/socket.h> |
| 32 | +#include <netinet/if_ether.h> |
| 33 | #include <linux/netlink.h> |
| 34 | #include <linux/rtnetlink.h> |
| 35 | #include <linux/genetlink.h> |
| 36 | diff --git a/src/network/netdev/tuntap.c b/src/network/netdev/tuntap.c |
| 37 | index 951138d..1ad499d 100644 |
| 38 | --- a/src/network/netdev/tuntap.c |
| 39 | +++ b/src/network/netdev/tuntap.c |
| 40 | @@ -2,6 +2,7 @@ |
| 41 | |
| 42 | #include <errno.h> |
| 43 | #include <fcntl.h> |
| 44 | +#include <netinet/if_ether.h> |
| 45 | #include <linux/if_tun.h> |
| 46 | #include <net/if.h> |
| 47 | #include <netinet/if_ether.h> |
| 48 | diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c |
| 49 | index 8377623..132af60 100644 |
| 50 | --- a/src/network/networkd-brvlan.c |
| 51 | +++ b/src/network/networkd-brvlan.c |
| 52 | @@ -4,6 +4,7 @@ |
| 53 | ***/ |
| 54 | |
| 55 | #include <netinet/in.h> |
| 56 | +#include <netinet/if_ether.h> |
| 57 | #include <linux/if_bridge.h> |
| 58 | #include <stdbool.h> |
| 59 | |
| 60 | diff --git a/src/udev/net/ethtool-util.c b/src/udev/net/ethtool-util.c |
| 61 | index 0dcec03..3695b10 100644 |
| 62 | --- a/src/udev/net/ethtool-util.c |
| 63 | +++ b/src/udev/net/ethtool-util.c |
| 64 | @@ -1,5 +1,6 @@ |
| 65 | /* SPDX-License-Identifier: LGPL-2.1+ */ |
| 66 | |
| 67 | +#include <netinet/if_ether.h> |
| 68 | #include <net/if.h> |
| 69 | #include <sys/ioctl.h> |
| 70 | #include <linux/ethtool.h> |
| 71 | diff --git a/src/udev/net/ethtool-util.h b/src/udev/net/ethtool-util.h |
| 72 | index 618b26b..ebfe82a 100644 |
| 73 | --- a/src/udev/net/ethtool-util.h |
| 74 | +++ b/src/udev/net/ethtool-util.h |
| 75 | @@ -2,6 +2,7 @@ |
| 76 | #pragma once |
| 77 | |
| 78 | #include <macro.h> |
| 79 | +#include <netinet/if_ether.h> |
| 80 | #include <linux/ethtool.h> |
| 81 | |
| 82 | #include "conf-parser.h" |
| 83 | diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c |
| 84 | index a845dfa..177289a 100644 |
| 85 | --- a/src/udev/udev-builtin-net_setup_link.c |
| 86 | +++ b/src/udev/udev-builtin-net_setup_link.c |
| 87 | @@ -1,5 +1,6 @@ |
| 88 | /* SPDX-License-Identifier: LGPL-2.1+ */ |
| 89 | |
| 90 | +#include <netinet/if_ether.h> |
| 91 | #include "device-util.h" |
| 92 | #include "alloc-util.h" |
| 93 | #include "link-config.h" |
| 94 | -- |
| 95 | 2.7.4 |
| 96 | |