瀏覽代碼

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>
Johannes Berg 13 年之前
父節點
當前提交
d26ad3771f
共有 6 個文件被更改,包括 4 次插入2 次删除
  1. 0 1
      net/mac80211/ibss.c
  2. 1 0
      net/mac80211/key.c
  3. 0 1
      net/mac80211/mesh.h
  4. 1 0
      net/mac80211/mesh_hwmp.c
  5. 1 0
      net/mac80211/rx.c
  6. 1 0
      net/mac80211/status.c

+ 0 - 1
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"

+ 1 - 0
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"

+ 0 - 1
net/mac80211/mesh.h

@@ -13,7 +13,6 @@
 
 #include <linux/types.h>
 #include <linux/jhash.h>
-#include <asm/unaligned.h>
 #include "ieee80211_i.h"
 
 

+ 1 - 0
net/mac80211/mesh_hwmp.c

@@ -8,6 +8,7 @@
  */
 
 #include <linux/slab.h>
+#include <asm/unaligned.h>
 #include "wme.h"
 #include "mesh.h"
 

+ 1 - 0
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"

+ 1 - 0
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"