From ba4142b328566d11f01806d140cf24e846484a2a Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sun, 13 Dec 2020 17:07:40 +0100
Subject: [PATCH] libnm: replace <netinet/ether.h> by
 <net/ethernet.h>/<net/if_arp.h> in "nm-utils.c"

Including <netinet/ether.h> with musl leads to a conflict with <linux/if_ether.h>,
due to redefining ethhdr struct. As we include <linux/if_ether.h> in "nm-utils.h",
that is a problem.

Avoid that, by including other headers.
---
 libnm-core/nm-utils.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index 7834462f5..1b6ebfd5a 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -8,8 +8,9 @@
 #include "nm-utils.h"
 
 #include <stdlib.h>
-#include <netinet/ether.h>
+#include <net/ethernet.h>
 #include <arpa/inet.h>
+#include <net/if_arp.h>
 #include <uuid/uuid.h>
 #include <libintl.h>
 #include <gmodule.h>