summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2018-01-13 13:26:37 +0100
committerThomas Haller <thaller@redhat.com>2018-01-14 15:18:58 +0100
commitaa5c0e4cf9c05549758f6189f21c3e79a09c9e98 (patch)
treeafc43cc417f75e503dbb456691d4decc96387094
parent1f8342bac88126af4b52a7b7dde417f0b704dddd (diff)
downloadNetworkManager-aa5c0e4cf9c05549758f6189f21c3e79a09c9e98.tar.gz
wifi: cleanup includes
- always include the corresponding header file first after "nm-default.h". - include all our other headers last.
-rw-r--r--src/platform/wifi/wifi-utils-nl80211.c3
-rw-r--r--src/platform/wifi/wifi-utils-wext.c11
2 files changed, 8 insertions, 6 deletions
diff --git a/src/platform/wifi/wifi-utils-nl80211.c b/src/platform/wifi/wifi-utils-nl80211.c
index a5f25b0269..c483394d0b 100644
--- a/src/platform/wifi/wifi-utils-nl80211.c
+++ b/src/platform/wifi/wifi-utils-nl80211.c
@@ -22,6 +22,8 @@
#include "nm-default.h"
+#include "wifi-utils-nl80211.h"
+
#include <errno.h>
#include <string.h>
#include <sys/ioctl.h>
@@ -32,7 +34,6 @@
#include <linux/nl80211.h>
#include "wifi-utils-private.h"
-#include "wifi-utils-nl80211.h"
#include "platform/nm-platform.h"
#include "platform/nm-platform-utils.h"
#include "nm-utils.h"
diff --git a/src/platform/wifi/wifi-utils-wext.c b/src/platform/wifi/wifi-utils-wext.c
index c4d3c99962..c7c07e1426 100644
--- a/src/platform/wifi/wifi-utils-wext.c
+++ b/src/platform/wifi/wifi-utils-wext.c
@@ -21,17 +21,14 @@
#include "nm-default.h"
+#include "wifi-utils-wext.h"
+
#include <errno.h>
#include <string.h>
#include <sys/ioctl.h>
#include <net/ethernet.h>
#include <unistd.h>
-#include "wifi-utils-private.h"
-#include "wifi-utils-wext.h"
-#include "nm-utils.h"
-#include "platform/nm-platform-utils.h"
-
/* Hacks necessary to #include wireless.h; yay for WEXT */
#ifndef __user
#define __user
@@ -41,6 +38,10 @@
#include <sys/socket.h>
#include <linux/wireless.h>
+#include "wifi-utils-private.h"
+#include "nm-utils.h"
+#include "platform/nm-platform-utils.h"
+
typedef struct {
WifiData parent;
int fd;