| From 21080b6a40d0a4ddd2db8f0fa37686f6fa885d1c Mon Sep 17 00:00:00 2001 |
| From: Khem Raj <raj.khem@gmail.com> |
| Date: Mon, 23 Oct 2017 11:38:33 -0700 |
| Subject: [PATCH 06/12] Include netinet/if_ether.h |
| |
| Fixes |
| /mnt/a/oe/build/tmp/work/mips32r2-bec-linux-musl/systemd/1_234-r0/recipe-sysroot/usr/include/netinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr' |
| struct ethhdr { |
| ^~~~~~ |
| |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| --- |
| Upstream-Status: Pending |
| |
| src/libsystemd/sd-netlink/netlink-types.c | 1 + |
| src/network/netdev/tuntap.c | 1 + |
| src/network/networkd-brvlan.c | 1 + |
| src/udev/net/ethtool-util.c | 2 +- |
| src/udev/udev-builtin-net_setup_link.c | 2 +- |
| 5 files changed, 5 insertions(+), 2 deletions(-) |
| |
| diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c |
| index 923f7dd10..b95b1e4b2 100644 |
| --- a/src/libsystemd/sd-netlink/netlink-types.c |
| +++ b/src/libsystemd/sd-netlink/netlink-types.c |
| @@ -19,6 +19,7 @@ |
| |
| #include <stdint.h> |
| #include <sys/socket.h> |
| +#include <netinet/if_ether.h> |
| #include <linux/netlink.h> |
| #include <linux/rtnetlink.h> |
| #include <linux/can/netlink.h> |
| diff --git a/src/network/netdev/tuntap.c b/src/network/netdev/tuntap.c |
| index 3d6280884..40e58c38f 100644 |
| --- a/src/network/netdev/tuntap.c |
| +++ b/src/network/netdev/tuntap.c |
| @@ -18,6 +18,7 @@ |
| ***/ |
| |
| #include <fcntl.h> |
| +#include <netinet/if_ether.h> |
| #include <linux/if_tun.h> |
| #include <net/if.h> |
| #include <netinet/if_ether.h> |
| diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c |
| index fa5d3ee7f..e0828962a 100644 |
| --- a/src/network/networkd-brvlan.c |
| +++ b/src/network/networkd-brvlan.c |
| @@ -18,6 +18,7 @@ |
| ***/ |
| |
| #include <netinet/in.h> |
| +#include <netinet/if_ether.h> |
| #include <linux/if_bridge.h> |
| #include <stdbool.h> |
| |
| diff --git a/src/udev/net/ethtool-util.c b/src/udev/net/ethtool-util.c |
| index 201fc2343..5f7cc2a0a 100644 |
| --- a/src/udev/net/ethtool-util.c |
| +++ b/src/udev/net/ethtool-util.c |
| @@ -16,7 +16,7 @@ |
| You should have received a copy of the GNU Lesser General Public License |
| along with systemd; If not, see <http://www.gnu.org/licenses/>. |
| ***/ |
| - |
| +#include <netinet/if_ether.h> |
| #include <net/if.h> |
| #include <sys/ioctl.h> |
| #include <linux/ethtool.h> |
| diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c |
| index 8e4777513..d01fff2a4 100644 |
| --- a/src/udev/udev-builtin-net_setup_link.c |
| +++ b/src/udev/udev-builtin-net_setup_link.c |
| @@ -16,7 +16,7 @@ |
| You should have received a copy of the GNU Lesser General Public License |
| along with systemd; If not, see <http://www.gnu.org/licenses/>. |
| ***/ |
| - |
| +#include <netinet/if_ether.h> |
| #include "alloc-util.h" |
| #include "link-config.h" |
| #include "log.h" |
| -- |
| 2.14.2 |
| |