From 109e8c532d0ed9ca50545f39887843b97cc737f5 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Thu, 12 Feb 2009 12:32:55 -0500
Subject: [PATCH] --- yaml --- r: 134831 b: refs/heads/master c:
 f3734ee6df3ac57151e02d091f47d5e52e646539 h: refs/heads/master i:   134829:
 aa11d09f699f164dfdf1e06ed5ea0d7194226f7d   134827:
 9cebf62132309dd6fc867085954854c02139b9ae   134823:
 473c49ce6586d0931bb9d710da38d1a703a61b94   134815:
 e856dedeb12a32b8d83becc65e5a51a8027ae5ce v: v3

---
 [refs]                                                        | 2 +-
 trunk/drivers/net/wireless/ipw2x00/Kconfig                    | 2 +-
 .../{include/net => drivers/net/wireless/ipw2x00}/ieee80211.h | 0
 trunk/drivers/net/wireless/ipw2x00/ipw2100.h                  | 4 ++--
 trunk/drivers/net/wireless/ipw2x00/ipw2200.h                  | 3 ++-
 trunk/drivers/net/wireless/ipw2x00/libipw_geo.c               | 2 +-
 trunk/drivers/net/wireless/ipw2x00/libipw_module.c            | 2 +-
 trunk/drivers/net/wireless/ipw2x00/libipw_rx.c                | 3 ++-
 trunk/drivers/net/wireless/ipw2x00/libipw_tx.c                | 2 +-
 trunk/drivers/net/wireless/ipw2x00/libipw_wx.c                | 3 ++-
 10 files changed, 13 insertions(+), 10 deletions(-)
 rename trunk/{include/net => drivers/net/wireless/ipw2x00}/ieee80211.h (100%)

diff --git a/[refs] b/[refs]
index 4d2b58c02de0..23be37ddd83f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ea893fde29d8cf1639da8989f4b843dc3283ca8
+refs/heads/master: f3734ee6df3ac57151e02d091f47d5e52e646539
diff --git a/trunk/drivers/net/wireless/ipw2x00/Kconfig b/trunk/drivers/net/wireless/ipw2x00/Kconfig
index 1d5dc3e9c5fb..85cc79995f6f 100644
--- a/trunk/drivers/net/wireless/ipw2x00/Kconfig
+++ b/trunk/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/trunk/include/net/ieee80211.h b/trunk/drivers/net/wireless/ipw2x00/ieee80211.h
similarity index 100%
rename from trunk/include/net/ieee80211.h
rename to trunk/drivers/net/wireless/ipw2x00/ieee80211.h
diff --git a/trunk/drivers/net/wireless/ipw2x00/ipw2100.h b/trunk/drivers/net/wireless/ipw2x00/ipw2100.h
index bbf1ddcafba8..46b135d21670 100644
--- a/trunk/drivers/net/wireless/ipw2x00/ipw2100.h
+++ b/trunk/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/trunk/drivers/net/wireless/ipw2x00/ipw2200.h b/trunk/drivers/net/wireless/ipw2x00/ipw2200.h
index 277b274d4be5..3e66c998dfea 100644
--- a/trunk/drivers/net/wireless/ipw2x00/ipw2200.h
+++ b/trunk/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/trunk/drivers/net/wireless/ipw2x00/libipw_geo.c b/trunk/drivers/net/wireless/ipw2x00/libipw_geo.c
index 960ad13f5e9f..9dfbb8760f67 100644
--- a/trunk/drivers/net/wireless/ipw2x00/libipw_geo.c
+++ b/trunk/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/trunk/drivers/net/wireless/ipw2x00/libipw_module.c b/trunk/drivers/net/wireless/ipw2x00/libipw_module.c
index a2f5616d5b09..0f233ab6a95b 100644
--- a/trunk/drivers/net/wireless/ipw2x00/libipw_module.c
+++ b/trunk/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/trunk/drivers/net/wireless/ipw2x00/libipw_rx.c b/trunk/drivers/net/wireless/ipw2x00/libipw_rx.c
index 9c67dfae4320..4865475e8a81 100644
--- a/trunk/drivers/net/wireless/ipw2x00/libipw_rx.c
+++ b/trunk/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/trunk/drivers/net/wireless/ipw2x00/libipw_tx.c b/trunk/drivers/net/wireless/ipw2x00/libipw_tx.c
index f78f57e8844a..a874e9091919 100644
--- a/trunk/drivers/net/wireless/ipw2x00/libipw_tx.c
+++ b/trunk/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/trunk/drivers/net/wireless/ipw2x00/libipw_wx.c b/trunk/drivers/net/wireless/ipw2x00/libipw_wx.c
index 31ea3abfc327..dfbadb3b9bd5 100644
--- a/trunk/drivers/net/wireless/ipw2x00/libipw_wx.c
+++ b/trunk/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"
 };