diff options
| -rw-r--r-- | drivers/net/wireless/ipw2x00/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/ipw2x00/ieee80211.h (renamed from include/net/ieee80211.h) | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2100.h | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2200.h | 3 | ||||
| -rw-r--r-- | drivers/net/wireless/ipw2x00/libipw_geo.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/ipw2x00/libipw_module.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/ipw2x00/libipw_rx.c | 3 | ||||
| -rw-r--r-- | drivers/net/wireless/ipw2x00/libipw_tx.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/ipw2x00/libipw_wx.c | 3 |
9 files changed, 12 insertions, 9 deletions
diff --git a/drivers/net/wireless/ipw2x00/Kconfig b/drivers/net/wireless/ipw2x00/Kconfig index 1d5dc3e9c5f..85cc79995f6 100644 --- a/drivers/net/wireless/ipw2x00/Kconfig +++ b/drivers/net/wireless/ipw2x00/Kconfig @@ -186,7 +186,7 @@ config LIBIPW_DEBUG % echo 0x00000FFO > /proc/net/ieee80211/debug_level For a list of values you can assign to debug_level, you - can look at the bit mask values in <net/ieee80211.h> + can look at the bit mask values in ieee80211.h If you are not trying to debug or develop the libipw component, you most likely want to say N here. diff --git a/include/net/ieee80211.h b/drivers/net/wireless/ipw2x00/ieee80211.h index adb7cf31f78..adb7cf31f78 100644 --- a/include/net/ieee80211.h +++ b/drivers/net/wireless/ipw2x00/ieee80211.h diff --git a/drivers/net/wireless/ipw2x00/ipw2100.h b/drivers/net/wireless/ipw2x00/ipw2100.h index bbf1ddcafba..46b135d2167 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.h +++ b/drivers/net/wireless/ipw2x00/ipw2100.h @@ -39,8 +39,6 @@ #include <linux/wireless.h> #include <net/iw_handler.h> // new driver API -#include <net/ieee80211.h> - #ifdef CONFIG_IPW2100_MONITOR #include <net/ieee80211_radiotap.h> #endif @@ -48,6 +46,8 @@ #include <linux/workqueue.h> #include <linux/mutex.h> +#include "ieee80211.h" + struct ipw2100_priv; struct ipw2100_tx_packet; struct ipw2100_rx_packet; diff --git a/drivers/net/wireless/ipw2x00/ipw2200.h b/drivers/net/wireless/ipw2x00/ipw2200.h index 277b274d4be..3e66c998dfe 100644 --- a/drivers/net/wireless/ipw2x00/ipw2200.h +++ b/drivers/net/wireless/ipw2x00/ipw2200.h @@ -49,13 +49,14 @@ #include <asm/io.h> #include <net/lib80211.h> -#include <net/ieee80211.h> #include <net/ieee80211_radiotap.h> #define DRV_NAME "ipw2200" #include <linux/workqueue.h> +#include "ieee80211.h" + /* Authentication and Association States */ enum connection_manager_assoc_states { CMAS_INIT = 0, diff --git a/drivers/net/wireless/ipw2x00/libipw_geo.c b/drivers/net/wireless/ipw2x00/libipw_geo.c index 960ad13f5e9..9dfbb8760f6 100644 --- a/drivers/net/wireless/ipw2x00/libipw_geo.c +++ b/drivers/net/wireless/ipw2x00/libipw_geo.c @@ -41,7 +41,7 @@ #include <linux/etherdevice.h> #include <asm/uaccess.h> -#include <net/ieee80211.h> +#include "ieee80211.h" int ieee80211_is_valid_channel(struct ieee80211_device *ieee, u8 channel) { diff --git a/drivers/net/wireless/ipw2x00/libipw_module.c b/drivers/net/wireless/ipw2x00/libipw_module.c index a2f5616d5b0..0f233ab6a95 100644 --- a/drivers/net/wireless/ipw2x00/libipw_module.c +++ b/drivers/net/wireless/ipw2x00/libipw_module.c @@ -50,7 +50,7 @@ #include <net/net_namespace.h> #include <net/arp.h> -#include <net/ieee80211.h> +#include "ieee80211.h" #define DRV_DESCRIPTION "802.11 data/management/control stack" #define DRV_NAME "ieee80211" diff --git a/drivers/net/wireless/ipw2x00/libipw_rx.c b/drivers/net/wireless/ipw2x00/libipw_rx.c index 9c67dfae432..4865475e8a8 100644 --- a/drivers/net/wireless/ipw2x00/libipw_rx.c +++ b/drivers/net/wireless/ipw2x00/libipw_rx.c @@ -33,7 +33,8 @@ #include <linux/ctype.h> #include <net/lib80211.h> -#include <net/ieee80211.h> + +#include "ieee80211.h" static void ieee80211_monitor_rx(struct ieee80211_device *ieee, struct sk_buff *skb, diff --git a/drivers/net/wireless/ipw2x00/libipw_tx.c b/drivers/net/wireless/ipw2x00/libipw_tx.c index f78f57e8844..a874e909191 100644 --- a/drivers/net/wireless/ipw2x00/libipw_tx.c +++ b/drivers/net/wireless/ipw2x00/libipw_tx.c @@ -41,7 +41,7 @@ #include <linux/etherdevice.h> #include <asm/uaccess.h> -#include <net/ieee80211.h> +#include "ieee80211.h" /* diff --git a/drivers/net/wireless/ipw2x00/libipw_wx.c b/drivers/net/wireless/ipw2x00/libipw_wx.c index 31ea3abfc32..dfbadb3b9bd 100644 --- a/drivers/net/wireless/ipw2x00/libipw_wx.c +++ b/drivers/net/wireless/ipw2x00/libipw_wx.c @@ -35,9 +35,10 @@ #include <linux/jiffies.h> #include <net/lib80211.h> -#include <net/ieee80211.h> #include <linux/wireless.h> +#include "ieee80211.h" + static const char *ieee80211_modes[] = { "?", "a", "b", "ab", "g", "ag", "bg", "abg" }; |