mac80211: clean up asm/unaligned.h inclusion

Some files implicitly get this via mesh.h
which itself doesn't need it, so move the
inclusion into the right files. Some other
files don't need it at all but include it,
so remove it from there.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index 8361da4b36ab143d744ba03cde17c6fc5feac7d4..7f9ac577600a27419ba8c5f8728117efe913cad8 100644 (file)
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -20,7 +20,6 @@
 #include <linux/etherdevice.h>
 #include <linux/rtnetlink.h>
 #include <net/mac80211.h>
-#include <asm/unaligned.h>
 
 #include "ieee80211_i.h"
 #include "driver-ops.h"

diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index e8616b3ff636e8175dbf3e16cd31ce22a22ef954..5bb600d93d77b4cf2ec9c0196c002b7ab46538df 100644 (file)
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -17,6 +17,7 @@
 #include <linux/slab.h>
 #include <linux/export.h>
 #include <net/mac80211.h>
+#include <asm/unaligned.h>
 #include "ieee80211_i.h"
 #include "driver-ops.h"
 #include "debugfs_key.h"

diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h
index bd14bd26a2b64eec5321bb218e2cd407e60b2ada..c7e5c49471e5e8701f3ce602b189eb3acadb88ec 100644 (file)
--- a/net/mac80211/mesh.h
+++ b/net/mac80211/mesh.h
@@ -13,7 +13,6 @@
 
 #include <linux/types.h>
 #include <linux/jhash.h>
-#include <asm/unaligned.h>
 #include "ieee80211_i.h"
 
 

diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index c27dec904963ceccf94b37d488cdae8d2e875c10..31bc762f209df80841fbc2956b3fb3bc9c352ff6 100644 (file)
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@ -8,6 +8,7 @@
  */
 
 #include <linux/slab.h>
+#include <asm/unaligned.h>
 #include "wme.h"
 #include "mesh.h"
 

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 3ab85c02ef0403daacad61c3cd00d41fd2b6aadc..7a4ff02af2618bb96a85875a6b51f2fdabb49ec1 100644 (file)
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -19,6 +19,7 @@
 #include <linux/export.h>
 #include <net/mac80211.h>
 #include <net/ieee80211_radiotap.h>
+#include <asm/unaligned.h>
 
 #include "ieee80211_i.h"
 #include "driver-ops.h"

diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index d67f0b967f8abcfd3a5b8dac8b0504a7d41b0a63..c928e4a4effd99c75e2d179342fd56c1722358e8 100644 (file)
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -11,6 +11,7 @@
 
 #include <linux/export.h>
 #include <net/mac80211.h>
+#include <asm/unaligned.h>
 #include "ieee80211_i.h"
 #include "rate.h"
 #include "mesh.h"