Most headers don't specify all includes they need. This patch fixes that.
Signed-off-by: Jiri Benc <[EMAIL PROTECTED]>
---
include/net/d80211.h | 6 +++++-
include/net/d80211_common.h | 2 ++
include/net/d80211_mgmt.h | 1 +
net/d80211/aes_ccm.h | 2 ++
net/d80211/hostapd_ioctl.h | 2 ++
net/d80211/ieee80211_i.h | 13 ++++++++++---
net/d80211/ieee80211_key.h | 3 +++
net/d80211/ieee80211_proc.h | 4 ++++
net/d80211/ieee80211_sysfs.c | 2 --
net/d80211/michael.h | 2 ++
net/d80211/rate_control.h | 7 +++++++
net/d80211/sta_info.h | 6 ++++++
net/d80211/tkip.h | 3 +++
net/d80211/wep.h | 5 +++++
net/d80211/wme.h | 6 ++++++
net/d80211/wpa.h | 4 ++++
16 files changed, 62 insertions(+), 6 deletions(-)
110d4f10024ccfe8a734abcddf4a2d61ada224a6
diff --git a/include/net/d80211.h b/include/net/d80211.h
index b558467..6b24183 100644
--- a/include/net/d80211.h
+++ b/include/net/d80211.h
@@ -10,7 +10,11 @@
#ifndef D80211_H
#define D80211_H
-#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/if_ether.h>
+#include <linux/netdevice.h>
+#include <linux/skbuff.h>
+#include <linux/wireless.h>
#include "d80211_shared.h"
/* Note! Only ieee80211_tx_status_irqsafe() and ieee80211_rx_irqsave() can be
diff --git a/include/net/d80211_common.h b/include/net/d80211_common.h
index db1c573..69ea939 100644
--- a/include/net/d80211_common.h
+++ b/include/net/d80211_common.h
@@ -10,6 +10,8 @@
#ifndef D80211_COMMON_H
#define D80211_COMMON_H
+#include <linux/types.h>
+
/*
* This is common header information with user space. It is used on all
* frames sent to wlan#ap interface.
diff --git a/include/net/d80211_mgmt.h b/include/net/d80211_mgmt.h
index 26315d6..8066af7 100644
--- a/include/net/d80211_mgmt.h
+++ b/include/net/d80211_mgmt.h
@@ -12,6 +12,7 @@
#ifndef D802_11_MGMT_H
#define D802_11_MGMT_H
+#include <linux/types.h>
struct ieee80211_mgmt {
u16 frame_control;
diff --git a/net/d80211/aes_ccm.h b/net/d80211/aes_ccm.h
index f741b08..d30cf26 100644
--- a/net/d80211/aes_ccm.h
+++ b/net/d80211/aes_ccm.h
@@ -9,6 +9,8 @@
#ifndef AES_CCM_H
#define AES_CCM_H
+#include <linux/types.h>
+
#define AES_BLOCK_LEN 16
#define AES_STATE_LEN 44
diff --git a/net/d80211/hostapd_ioctl.h b/net/d80211/hostapd_ioctl.h
index eff4858..ddd315f 100644
--- a/net/d80211/hostapd_ioctl.h
+++ b/net/d80211/hostapd_ioctl.h
@@ -13,6 +13,8 @@
#ifndef HOSTAPD_IOCTL_H
#define HOSTAPD_IOCTL_H
+#include <linux/types.h>
+
#ifndef __KERNEL__
#include "ieee80211_shared.h"
#endif /* __KERNEL__ */
diff --git a/net/d80211/ieee80211_i.h b/net/d80211/ieee80211_i.h
index 48aceca..acbe130 100644
--- a/net/d80211/ieee80211_i.h
+++ b/net/d80211/ieee80211_i.h
@@ -10,6 +10,16 @@
#ifndef IEEE80211_I_H
#define IEEE80211_I_H
+#include <linux/kernel.h>
+#include <linux/device.h>
+#include <linux/if_ether.h>
+#include <linux/interrupt.h>
+#include <linux/list.h>
+#include <linux/netdevice.h>
+#include <linux/skbuff.h>
+#include "ieee80211_key.h"
+#include "sta_info.h"
+
/* ieee80211.o internal definitions, etc. These are not included into
* low-level drivers. */
@@ -21,9 +31,6 @@
struct ieee80211_local;
-#include "ieee80211_key.h"
-#include "sta_info.h"
-
#define BIT(x) (1 << (x))
#define IEEE80211_ALIGN32_PAD(a) ((4 - ((a) & 3)) & 3)
diff --git a/net/d80211/ieee80211_key.h b/net/d80211/ieee80211_key.h
index 7a2415d..0c332d3 100644
--- a/net/d80211/ieee80211_key.h
+++ b/net/d80211/ieee80211_key.h
@@ -10,6 +10,9 @@
#ifndef IEEE80211_KEY_H
#define IEEE80211_KEY_H
+#include <linux/types.h>
+#include <net/d80211.h>
+
/* ALG_TKIP
* struct ieee80211_key::key is encoded as a 256-bit (32 byte) data block:
* Temporal Encryption Key (128 bits)
diff --git a/net/d80211/ieee80211_proc.h b/net/d80211/ieee80211_proc.h
index a8e49e9..8c76560 100644
--- a/net/d80211/ieee80211_proc.h
+++ b/net/d80211/ieee80211_proc.h
@@ -9,6 +9,10 @@
#ifndef IEEE80211_PROC_H
#define IEEE80211_PROC_H
+#include <linux/netdevice.h>
+#include "ieee80211_i.h"
+#include "sta_info.h"
+
#ifdef CONFIG_PROC_FS
void ieee80211_proc_init_sta(struct ieee80211_local *local,
diff --git a/net/d80211/ieee80211_sysfs.c b/net/d80211/ieee80211_sysfs.c
index b6b985d..b4a658a 100644
--- a/net/d80211/ieee80211_sysfs.c
+++ b/net/d80211/ieee80211_sysfs.c
@@ -9,9 +9,7 @@
#include <linux/kernel.h>
#include <linux/device.h>
#include <linux/if.h>
-#include <linux/if_ether.h>
#include <linux/interrupt.h>
-#include <linux/netdevice.h>
#include <linux/rtnetlink.h>
#include <net/d80211.h>
#include "ieee80211_i.h"
diff --git a/net/d80211/michael.h b/net/d80211/michael.h
index 5acd8fd..2e6aeba 100644
--- a/net/d80211/michael.h
+++ b/net/d80211/michael.h
@@ -10,6 +10,8 @@
#ifndef MICHAEL_H
#define MICHAEL_H
+#include <linux/types.h>
+
#define MICHAEL_MIC_LEN 8
void michael_mic(u8 *key, u8 *da, u8 *sa, u8 priority,
diff --git a/net/d80211/rate_control.h b/net/d80211/rate_control.h
index 9ceea7d..26d3c0f 100644
--- a/net/d80211/rate_control.h
+++ b/net/d80211/rate_control.h
@@ -10,6 +10,13 @@
#ifndef RATE_CONTROL
#define RATE_CONTROL
+#include <linux/netdevice.h>
+#include <linux/skbuff.h>
+#include <linux/types.h>
+#include <net/d80211.h>
+#include "ieee80211_i.h"
+#include "sta_info.h"
+
#define RATE_CONTROL_NUM_DOWN 20
#define RATE_CONTROL_NUM_UP 15
diff --git a/net/d80211/sta_info.h b/net/d80211/sta_info.h
index d3d8fc5..294cb0a 100644
--- a/net/d80211/sta_info.h
+++ b/net/d80211/sta_info.h
@@ -9,6 +9,11 @@
#ifndef STA_INFO_H
#define STA_INFO_H
+#include <linux/if_ether.h>
+#include <linux/types.h>
+#include "ieee80211_i.h"
+#include "ieee80211_key.h"
+
/* Stations flags (struct sta_info::flags) */
#define WLAN_STA_AUTH BIT(0)
#define WLAN_STA_ASSOC BIT(1)
@@ -125,6 +130,7 @@ struct sta_info {
*/
#define STA_INFO_CLEANUP_INTERVAL (10 * HZ)
+struct ieee80211_local;
struct sta_info * sta_info_get(struct ieee80211_local *local, u8 *addr);
int sta_info_min_txrate_get(struct ieee80211_local *local);
diff --git a/net/d80211/tkip.h b/net/d80211/tkip.h
index 6c4ab7f..4239cec 100644
--- a/net/d80211/tkip.h
+++ b/net/d80211/tkip.h
@@ -9,6 +9,9 @@
#ifndef TKIP_H
#define TKIP_H
+#include <linux/types.h>
+#include "ieee80211_key.h"
+
u8 * ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key,
u8 iv0, u8 iv1, u8 iv2);
void ieee80211_tkip_encrypt_data(struct ieee80211_key *key, u8 *pos,
diff --git a/net/d80211/wep.h b/net/d80211/wep.h
index 6f69394..1d76639 100644
--- a/net/d80211/wep.h
+++ b/net/d80211/wep.h
@@ -11,6 +11,11 @@
#ifndef WEP_H
#define WEP_H
+#include <linux/skbuff.h>
+#include <linux/types.h>
+#include "ieee80211_i.h"
+#include "ieee80211_key.h"
+
void ieee80211_wep_init(struct ieee80211_local *local);
void ieee80211_wep_get_iv(struct ieee80211_local *local,
struct ieee80211_key *key, u8 *iv);
diff --git a/net/d80211/wme.h b/net/d80211/wme.h
index 9b27947..44a2c33 100644
--- a/net/d80211/wme.h
+++ b/net/d80211/wme.h
@@ -8,7 +8,12 @@
* published by the Free Software Foundation.
*/
+#ifndef _WME_H
+#define _WME_H
+
#include <asm/byteorder.h>
+#include <linux/netdevice.h>
+#include <linux/types.h>
#include <net/pkt_sched.h>
#define QOS_CONTROL_LEN 2
@@ -51,3 +56,4 @@ void ieee80211_install_qdisc(struct net_
int ieee80211_wme_register(void);
void ieee80211_wme_unregister(void);
+#endif
diff --git a/net/d80211/wpa.h b/net/d80211/wpa.h
index 9ad7c08..cfbb93f 100644
--- a/net/d80211/wpa.h
+++ b/net/d80211/wpa.h
@@ -9,6 +9,10 @@
#ifndef WPA_H
#define WPA_H
+#include <linux/skbuff.h>
+#include <linux/types.h>
+#include "ieee80211_i.h"
+
ieee80211_txrx_result
ieee80211_tx_h_michael_mic_add(struct ieee80211_txrx_data *tx);
ieee80211_txrx_result
--
1.1.6
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
