From f81abf62c0ae93628df36c27357358523be25fb8 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 31 Mar 2017 15:57:05 -0700
Subject: [PATCH 1/7] adjust net/ headers for musl compatibility

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 libnm-core/nm-utils.c          | 13 ++++++++-----
 libnm-core/nm-utils.h          |  5 ++---
 src/platform/wifi/wifi-utils.h |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index ebbbfd3..77273df 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -19,14 +19,9 @@
  * Copyright 2005 - 2017 Red Hat, Inc.
  */
 
-#include "nm-default.h"
-
-#include "nm-utils.h"
-
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <netinet/ether.h>
 #include <arpa/inet.h>
 #include <uuid/uuid.h>
 #include <libintl.h>
@@ -34,12 +29,20 @@
 #include <sys/stat.h>
 #include <net/if.h>
 #include <linux/pkt_sched.h>
+//#include <net/if_arp.h>
+//#include <net/ethernet.h>
+#include <netinet/ether.h>
+
+#include "nm-default.h"
+
+#include "nm-utils.h"
 
 #if WITH_JANSSON
 #include "nm-json.h"
 #include <jansson.h>
 #endif
 
+
 #include "nm-utils/nm-enum-utils.h"
 #include "nm-utils/nm-hash-utils.h"
 #include "nm-common-macros.h"
diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
index df9284b..02e24ea 100644
--- a/libnm-core/nm-utils.h
+++ b/libnm-core/nm-utils.h
@@ -27,11 +27,10 @@
 
 #include <glib.h>
 
-#include <netinet/in.h>
-
 /* For ETH_ALEN and INFINIBAND_ALEN */
-#include <linux/if_ether.h>
+//#include <linux/if_ether.h>
 #include <linux/if_infiniband.h>
+#include <netinet/in.h>
 
 #include "nm-core-enum-types.h"
 #include "nm-setting-wireless-security.h"
diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h
index 705717b..939080f 100644
--- a/src/platform/wifi/wifi-utils.h
+++ b/src/platform/wifi/wifi-utils.h
@@ -22,7 +22,7 @@
 #ifndef __WIFI_UTILS_H__
 #define __WIFI_UTILS_H__
 
-#include <net/ethernet.h>
+//#include <net/ethernet.h>
 
 #include "nm-dbus-interface.h"
 
-- 
2.14.1