libnm-core: include ETH_ALEN/INFINIBAND_ALEN defines in nm-utils.h

Include <linux/if_ether.h> and <linux/if_infiniband.h> from
nm-utils.h, to get ETH_ALEN and INFINIBAND_ALEN, and remove those
includes (as well as <net/ethernet.h> and <netinet/ether.h>, and
various headers that had been included to get the ARPHRD_* constants)
from other files where they're not needed now.

clients/cli/devices.c

@@ -23,7 +23,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <netinet/ether.h>
 #include <readline/readline.h>
 
 #include <glib.h>

clients/cli/settings.c

@@ -19,8 +19,6 @@
 
 #include "config.h"
 
-#include <linux/if_ether.h>
-#include <linux/if_infiniband.h>
 #include <stdio.h>
 #include <stdlib.h>
 

clients/tui/nmt-mac-entry.h

@@ -19,10 +19,7 @@
 #ifndef NMT_MAC_ENTRY_H
 #define NMT_MAC_ENTRY_H
 
-#include <linux/if_ether.h>
-#include <linux/if_infiniband.h>
-#include <linux/if_arp.h>
-
+#include "nm-utils.h"
 #include "nmt-newt.h"
 
 G_BEGIN_DECLS

libnm-core/nm-setting-bridge.c

@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <dbus/dbus-glib.h>
 #include <glib/gi18n.h>
-#include <linux/if_ether.h>
 
 #include "nm-setting-bridge.h"
 #include "nm-param-spec-specialized.h"

libnm-core/nm-setting-infiniband.c

@@ -21,7 +21,6 @@
 
 #include <stdlib.h>
 #include <dbus/dbus-glib.h>
-#include <linux/if_infiniband.h>
 #include <glib/gi18n.h>
 
 #include "nm-setting-infiniband.h"

libnm-core/nm-setting-olpc-mesh.c

@@ -21,7 +21,6 @@
  */
 
 #include <string.h>
-#include <netinet/ether.h>
 #include <dbus/dbus-glib.h>
 #include <glib/gi18n.h>
 

libnm-core/nm-setting-wired.c

@@ -22,7 +22,6 @@
 
 #include <string.h>
 #include <net/ethernet.h>
-#include <netinet/ether.h>
 #include <dbus/dbus-glib.h>
 #include <glib/gi18n.h>
 

libnm-core/nm-setting-wireless.c

@@ -22,7 +22,6 @@
 
 #include <string.h>
 #include <net/ethernet.h>
-#include <netinet/ether.h>
 #include <dbus/dbus-glib.h>
 #include <glib/gi18n.h>
 

libnm-core/nm-utils.c

@@ -24,7 +24,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <netinet/ether.h>
-#include <linux/if_infiniband.h>
 #include <uuid/uuid.h>
 #include <gmodule.h>
 

libnm-core/nm-utils.h

@@ -27,6 +27,10 @@
 
 #include <glib.h>
 
+/* For ETH_ALEN and INFINIBAND_ALEN */
+#include <linux/if_ether.h>
+#include <linux/if_infiniband.h>
+
 #include "nm-connection.h"
 #include "nm-core-enum-types.h"
 

libnm-core/tests/test-general.c

@@ -22,8 +22,6 @@
 #include <glib.h>
 #include <dbus/dbus-glib.h>
 #include <string.h>
-#include <netinet/ether.h>
-#include <linux/if_infiniband.h>
 
 #include <nm-utils.h>
 

libnm/nm-access-point.c

@@ -21,7 +21,6 @@
 
 #include <config.h>
 #include <string.h>
-#include <netinet/ether.h>
 
 #include "nm-glib-compat.h"
 

libnm/nm-device-bond.c

@@ -20,7 +20,6 @@
 
 #include <config.h>
 #include <string.h>
-#include <netinet/ether.h>
 
 #include "nm-glib-compat.h"
 

libnm/nm-device-bridge.c

@@ -20,7 +20,6 @@
 
 #include <config.h>
 #include <string.h>
-#include <netinet/ether.h>
 
 #include "nm-glib-compat.h"
 

libnm/nm-device-bt.c

@@ -21,7 +21,6 @@
 
 #include <config.h>
 #include <string.h>
-#include <netinet/ether.h>
 
 #include "nm-glib-compat.h"
 

libnm/nm-device-ethernet.c

@@ -21,7 +21,6 @@
 
 #include <config.h>
 #include <string.h>
-#include <netinet/ether.h>
 
 #include "nm-glib-compat.h"
 

libnm/nm-device-infiniband.c

@@ -20,8 +20,6 @@
 
 #include <config.h>
 #include <string.h>
-#include <linux/if_infiniband.h>
-#include <netinet/ether.h>
 
 #include "nm-glib-compat.h"
 

libnm/nm-device-team.c

@@ -20,7 +20,6 @@
 
 #include <config.h>
 #include <string.h>
-#include <netinet/ether.h>
 
 #include "nm-glib-compat.h"
 

libnm/nm-device-vlan.c

@@ -20,7 +20,6 @@
 
 #include <config.h>
 #include <string.h>
-#include <netinet/ether.h>
 
 #include "nm-glib-compat.h"
 

libnm/nm-device-wifi.c

@@ -21,7 +21,6 @@
 
 #include <config.h>
 #include <string.h>
-#include <netinet/ether.h>
 
 #include "nm-glib-compat.h"
 

libnm/nm-device-wimax.c

@@ -21,7 +21,6 @@
 
 #include <config.h>
 #include <string.h>
-#include <netinet/ether.h>
 
 #include "nm-glib-compat.h"
 

src/NetworkManagerUtils.h

@@ -24,7 +24,6 @@
 
 #include <glib.h>
 #include <stdio.h>
-#include <net/ethernet.h>
 
 #include "nm-connection.h"
 #include "nm-platform.h"

src/devices/adsl/nm-device-adsl.c

@@ -44,6 +44,7 @@
 
 #include "ppp-manager/nm-ppp-manager.h"
 #include "nm-setting-adsl.h"
+#include "nm-utils.h"
 
 #include "nm-device-adsl-glue.h"
 

src/devices/bluetooth/nm-bluez-device.c

@@ -23,8 +23,6 @@
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <string.h>
-#include <net/ethernet.h>
-#include <netinet/ether.h>
 
 #include "nm-dbus-interface.h"
 #include "nm-setting-bluetooth.h"

src/devices/bluetooth/nm-device-bt.c

@@ -22,8 +22,6 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <net/ethernet.h>
-#include <netinet/ether.h>
 
 #include <glib/gi18n.h>
 #include <gio/gio.h>

src/devices/nm-device-bond.c

@@ -23,7 +23,6 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include <netinet/ether.h>
 #include <errno.h>
 #include <stdlib.h>
 

src/devices/nm-device-bridge.c

@@ -23,7 +23,6 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include <netinet/ether.h>
 #include <stdlib.h>
 
 #include "gsystem-local-alloc.h"

src/devices/nm-device-ethernet.c

@@ -30,9 +30,7 @@
 #include <linux/version.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
-#include <linux/if.h>
 #include <errno.h>
-#include <netinet/ether.h>
 
 #include <gudev/gudev.h>
 

src/devices/nm-device-infiniband.c

@@ -24,7 +24,6 @@
 #include <glib/gi18n.h>
 
 #include <linux/if_infiniband.h>
-#include <netinet/ether.h>
 
 #include "nm-device-infiniband.h"
 #include "nm-logging.h"

src/devices/nm-device-vlan.c

@@ -24,8 +24,6 @@
 #include <glib/gi18n.h>
 
 #include <sys/socket.h>
-#include <linux/if.h>
-#include <netinet/ether.h>
 
 #include "nm-device-vlan.h"
 #include "nm-manager.h"

src/devices/nm-device.c

@@ -35,7 +35,6 @@
 #include <sys/wait.h>
 #include <arpa/inet.h>
 #include <fcntl.h>
-#include <linux/if.h>
 #include <netlink/route/addr.h>
 
 #include "gsystem-local-alloc.h"

src/devices/team/nm-device-team.c

@@ -27,7 +27,6 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include <netinet/ether.h>
 #include <teamdctl.h>
 #include <stdlib.h>
 

src/devices/wifi/nm-device-olpc-mesh.c

@@ -30,13 +30,10 @@
 #include <dbus/dbus.h>
 #include <netinet/in.h>
 #include <string.h>
-#include <net/ethernet.h>
-#include <netinet/ether.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <signal.h>
 #include <unistd.h>
-#include <linux/if.h>
 #include <sys/ioctl.h>
 #include <errno.h>
 

src/devices/wifi/nm-device-wifi.c

@@ -24,7 +24,6 @@
 #include <dbus/dbus.h>
 #include <netinet/in.h>
 #include <string.h>
-#include <net/ethernet.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <signal.h>
@@ -32,7 +31,6 @@
 #include <linux/sockios.h>
 #include <linux/ethtool.h>
 #include <sys/ioctl.h>
-#include <netinet/ether.h>
 #include <errno.h>
 
 #include "nm-glib-compat.h"

src/devices/wifi/nm-device-wifi.h

@@ -24,7 +24,6 @@
 
 #include <glib-object.h>
 #include <dbus/dbus.h>
-#include <net/ethernet.h>
 
 #include "nm-device.h"
 #include "nm-wifi-ap.h"

src/devices/wifi/nm-wifi-ap-utils.c

@@ -23,6 +23,7 @@
 #include <stdlib.h>
 
 #include "nm-wifi-ap-utils.h"
+#include "nm-utils.h"
 
 static gboolean
 verify_no_wep (NMSettingWirelessSecurity *s_wsec, const char *tag, GError **error)

src/devices/wifi/nm-wifi-ap-utils.h

@@ -21,7 +21,6 @@
 #ifndef NM_WIFI_AP_UTILS_H
 #define NM_WIFI_AP_UTILS_H
 
-#include <net/ethernet.h>
 
 #include <nm-dbus-interface.h>
 #include <nm-connection.h>

src/devices/wifi/nm-wifi-ap.c

@@ -21,7 +21,6 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <netinet/ether.h>
 
 #include "nm-wifi-ap.h"
 #include "nm-wifi-ap-utils.h"

src/devices/wifi/tests/test-wifi-ap-utils.c

@@ -28,6 +28,7 @@
 #include "nm-setting-wireless.h"
 #include "nm-setting-wireless-security.h"
 #include "nm-setting-8021x.h"
+#include "nm-utils.h"
 
 #define DEBUG 1
 

src/devices/wimax/iwmxsdk.c

@@ -28,7 +28,6 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/socket.h>
-#include <linux/if.h>
 
 #include <glib.h>
 

src/devices/wimax/nm-device-wimax.c

@@ -23,10 +23,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
-#include <net/ethernet.h>
 #include <sys/socket.h>
-#include <linux/if.h>
-#include <netinet/ether.h>
 
 #include <WiMaxAPI.h>
 #include <WiMaxAPIEx.h>

src/devices/wimax/nm-device-wimax.h

@@ -22,7 +22,6 @@
 #ifndef NM_DEVICE_WIMAX_H
 #define NM_DEVICE_WIMAX_H
 
-#include <net/ethernet.h>
 #include "nm-device.h"
 #include "nm-wimax-nsp.h"
 

src/nm-manager.c

@@ -22,7 +22,6 @@
 #include <config.h>
 
 #include <stdlib.h>
-#include <netinet/ether.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <string.h>

src/platform/nm-platform.h

@@ -24,7 +24,6 @@
 #include <glib-object.h>
 #include "nm-glib-compat.h"
 #include <netinet/in.h>
-#include <net/ethernet.h>
 #include <linux/if.h>
 #include <linux/if_addr.h>
 

src/platform/wifi/wifi-utils-wext.c

@@ -41,7 +41,6 @@
 #include <sys/types.h>
 #include <linux/types.h>
 #include <sys/socket.h>
-#include <linux/if.h>
 #include <linux/wireless.h>
 
 

src/ppp-manager/nm-ppp-manager.c

@@ -32,7 +32,6 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <asm/types.h>
-#include <linux/if.h>
 #include <sys/stat.h>
 
 #include <linux/ppp_defs.h>

src/settings/nm-settings-connection.c

@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <netinet/ether.h>
 
 #include <nm-dbus-interface.h>
 #include <dbus/dbus-glib-lowlevel.h>

src/settings/plugins/example/plugin.c

@@ -22,7 +22,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <sys/types.h>
-#include <netinet/ether.h>
 #include <string.h>
 
 #include <gmodule.h>

src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c

@@ -19,8 +19,6 @@
  */
 
 #include <string.h>
-#include <net/ethernet.h>
-#include <netinet/ether.h>
 
 #include <glib/gstdio.h>
 

src/settings/plugins/ifcfg-rh/plugin.c

@@ -25,8 +25,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
-#include <net/ethernet.h>
-#include <netinet/ether.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 

src/settings/plugins/ifcfg-rh/reader.c

@@ -29,8 +29,6 @@
 #include <errno.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
-#include <netinet/ether.h>
-#include <linux/if_infiniband.h>
 
 #include <glib.h>
 #include <glib/gi18n.h>

src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c

@@ -22,8 +22,6 @@
 #include <stdarg.h>
 #include <unistd.h>
 #include <string.h>
-#include <netinet/ether.h>
-#include <linux/if_infiniband.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>

src/settings/plugins/ifcfg-rh/writer.c

@@ -27,7 +27,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <netinet/ether.h>
 
 #include <nm-setting-connection.h>
 #include <nm-setting-wired.h>

src/settings/plugins/ifnet/connection_parser.c

@@ -24,7 +24,6 @@
 #include <string.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
-#include <netinet/ether.h>
 #include <errno.h>
 #include <glib/gi18n.h>
 

src/settings/plugins/ifupdown/plugin.c

@@ -25,8 +25,6 @@
 #include <string.h>
 #include <sys/inotify.h>
 
-#include <net/ethernet.h>
-#include <netinet/ether.h>
 
 #include <gmodule.h>
 #include <glib-object.h>

src/settings/plugins/keyfile/plugin.c

@@ -23,7 +23,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <sys/types.h>
-#include <netinet/ether.h>
 #include <string.h>
 
 #include <gmodule.h>

src/settings/plugins/keyfile/reader.c

@@ -36,8 +36,6 @@
 #include <nm-setting-8021x.h>
 #include <nm-utils.h>
 #include <arpa/inet.h>
-#include <netinet/ether.h>
-#include <linux/if_infiniband.h>
 #include <string.h>
 
 #include "nm-dbus-glib-types.h"

src/settings/plugins/keyfile/tests/test-keyfile.c

@@ -22,11 +22,9 @@
 #include <stdarg.h>
 #include <unistd.h>
 #include <string.h>
-#include <netinet/ether.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
-#include <linux/if_infiniband.h>
 
 #include <nm-utils.h>
 #include <nm-setting-connection.h>

src/settings/plugins/keyfile/writer.c

@@ -40,7 +40,6 @@
 #include <nm-utils.h>
 #include <string.h>
 #include <arpa/inet.h>
-#include <netinet/ether.h>
 
 #include "nm-dbus-glib-types.h"
 #include "nm-glib-compat.h"

src/supplicant-manager/nm-supplicant-config.c

@@ -26,7 +26,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <glib.h>
-#include <netinet/ether.h>
 #include <dbus/dbus-glib.h>
 
 #include "nm-supplicant-config.h"

src/supplicant-manager/tests/test-supplicant-config.c

@@ -22,7 +22,6 @@
 #include <stdarg.h>
 #include <unistd.h>
 #include <string.h>
-#include <netinet/ether.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>

src/tests/config/nm-test-device.c

@@ -21,10 +21,10 @@
 #include "config.h"
 
 #include <string.h>
-#include <netinet/ether.h>
 
 #include "nm-test-device.h"
 #include "nm-device-private.h"
+#include "nm-utils.h"
 
 static GObjectClass *g_object_class;
 

src/tests/test-general.c

@@ -21,7 +21,6 @@
 #include <glib.h>
 #include <string.h>
 #include <errno.h>
-#include <netinet/ether.h>
 
 #include "NetworkManagerUtils.h"
 #include "nm-logging.h"