diff options
| author | Dan Winship <danw@gnome.org> | 2014-08-02 10:50:25 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-08-07 14:04:14 -0400 |
| commit | 357efd26e4da4d6dacf2f0c58b41c136b098a253 (patch) | |
| tree | e3760979a02e838fb1027b603613a683bce554f5 /libnm | |
| parent | ea456aaa81f2290618421d28a824b85e02002fdf (diff) | |
| download | NetworkManager-357efd26e4da4d6dacf2f0c58b41c136b098a253.tar.gz | |
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.
Diffstat (limited to 'libnm')
| -rw-r--r-- | libnm/nm-access-point.c | 1 | ||||
| -rw-r--r-- | libnm/nm-device-bond.c | 1 | ||||
| -rw-r--r-- | libnm/nm-device-bridge.c | 1 | ||||
| -rw-r--r-- | libnm/nm-device-bt.c | 1 | ||||
| -rw-r--r-- | libnm/nm-device-ethernet.c | 1 | ||||
| -rw-r--r-- | libnm/nm-device-infiniband.c | 2 | ||||
| -rw-r--r-- | libnm/nm-device-team.c | 1 | ||||
| -rw-r--r-- | libnm/nm-device-vlan.c | 1 | ||||
| -rw-r--r-- | libnm/nm-device-wifi.c | 1 | ||||
| -rw-r--r-- | libnm/nm-device-wimax.c | 1 |
10 files changed, 0 insertions, 11 deletions
diff --git a/libnm/nm-access-point.c b/libnm/nm-access-point.c index 0e29bee29e..3bad4dee1c 100644 --- a/libnm/nm-access-point.c +++ b/libnm/nm-access-point.c @@ -21,7 +21,6 @@ #include <config.h> #include <string.h> -#include <netinet/ether.h> #include "nm-glib-compat.h" diff --git a/libnm/nm-device-bond.c b/libnm/nm-device-bond.c index 27d122baf3..73aedcff4e 100644 --- a/libnm/nm-device-bond.c +++ b/libnm/nm-device-bond.c @@ -20,7 +20,6 @@ #include <config.h> #include <string.h> -#include <netinet/ether.h> #include "nm-glib-compat.h" diff --git a/libnm/nm-device-bridge.c b/libnm/nm-device-bridge.c index 6cd58b6b23..545e2da06d 100644 --- a/libnm/nm-device-bridge.c +++ b/libnm/nm-device-bridge.c @@ -20,7 +20,6 @@ #include <config.h> #include <string.h> -#include <netinet/ether.h> #include "nm-glib-compat.h" diff --git a/libnm/nm-device-bt.c b/libnm/nm-device-bt.c index edda2e95ad..988811076e 100644 --- a/libnm/nm-device-bt.c +++ b/libnm/nm-device-bt.c @@ -21,7 +21,6 @@ #include <config.h> #include <string.h> -#include <netinet/ether.h> #include "nm-glib-compat.h" diff --git a/libnm/nm-device-ethernet.c b/libnm/nm-device-ethernet.c index d2e2d0e1c6..4dfdcd840b 100644 --- a/libnm/nm-device-ethernet.c +++ b/libnm/nm-device-ethernet.c @@ -21,7 +21,6 @@ #include <config.h> #include <string.h> -#include <netinet/ether.h> #include "nm-glib-compat.h" diff --git a/libnm/nm-device-infiniband.c b/libnm/nm-device-infiniband.c index 93b3298eb4..1b2720b0b8 100644 --- a/libnm/nm-device-infiniband.c +++ b/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" diff --git a/libnm/nm-device-team.c b/libnm/nm-device-team.c index 760117e104..1ce91ba41b 100644 --- a/libnm/nm-device-team.c +++ b/libnm/nm-device-team.c @@ -20,7 +20,6 @@ #include <config.h> #include <string.h> -#include <netinet/ether.h> #include "nm-glib-compat.h" diff --git a/libnm/nm-device-vlan.c b/libnm/nm-device-vlan.c index 00a40aa951..992d1188ad 100644 --- a/libnm/nm-device-vlan.c +++ b/libnm/nm-device-vlan.c @@ -20,7 +20,6 @@ #include <config.h> #include <string.h> -#include <netinet/ether.h> #include "nm-glib-compat.h" diff --git a/libnm/nm-device-wifi.c b/libnm/nm-device-wifi.c index 81c9a3279d..2cb3b5f84d 100644 --- a/libnm/nm-device-wifi.c +++ b/libnm/nm-device-wifi.c @@ -21,7 +21,6 @@ #include <config.h> #include <string.h> -#include <netinet/ether.h> #include "nm-glib-compat.h" diff --git a/libnm/nm-device-wimax.c b/libnm/nm-device-wimax.c index eb5d87fd68..95e17e35ba 100644 --- a/libnm/nm-device-wimax.c +++ b/libnm/nm-device-wimax.c @@ -21,7 +21,6 @@ #include <config.h> #include <string.h> -#include <netinet/ether.h> #include "nm-glib-compat.h" |