Ver Fonte

make net/ieee80211.h private to ipw2x00

Only ipw2x00 now uses it.  Reduce confusion.  Profit!

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Dan Williams há 16 anos atrás
pai
commit
f3734ee6df

+ 1 - 1
drivers/net/wireless/ipw2x00/Kconfig

@@ -186,7 +186,7 @@ config LIBIPW_DEBUG
 	  % echo 0x00000FFO > /proc/net/ieee80211/debug_level
 	  % echo 0x00000FFO > /proc/net/ieee80211/debug_level
 
 
 	  For a list of values you can assign to debug_level, you
 	  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
 	  If you are not trying to debug or develop the libipw
 	  component, you most likely want to say N here.
 	  component, you most likely want to say N here.

+ 0 - 0
include/net/ieee80211.h → drivers/net/wireless/ipw2x00/ieee80211.h


+ 2 - 2
drivers/net/wireless/ipw2x00/ipw2100.h

@@ -39,8 +39,6 @@
 #include <linux/wireless.h>
 #include <linux/wireless.h>
 #include <net/iw_handler.h>	// new driver API
 #include <net/iw_handler.h>	// new driver API
 
 
-#include <net/ieee80211.h>
-
 #ifdef CONFIG_IPW2100_MONITOR
 #ifdef CONFIG_IPW2100_MONITOR
 #include <net/ieee80211_radiotap.h>
 #include <net/ieee80211_radiotap.h>
 #endif
 #endif
@@ -48,6 +46,8 @@
 #include <linux/workqueue.h>
 #include <linux/workqueue.h>
 #include <linux/mutex.h>
 #include <linux/mutex.h>
 
 
+#include "ieee80211.h"
+
 struct ipw2100_priv;
 struct ipw2100_priv;
 struct ipw2100_tx_packet;
 struct ipw2100_tx_packet;
 struct ipw2100_rx_packet;
 struct ipw2100_rx_packet;

+ 2 - 1
drivers/net/wireless/ipw2x00/ipw2200.h

@@ -49,13 +49,14 @@
 #include <asm/io.h>
 #include <asm/io.h>
 
 
 #include <net/lib80211.h>
 #include <net/lib80211.h>
-#include <net/ieee80211.h>
 #include <net/ieee80211_radiotap.h>
 #include <net/ieee80211_radiotap.h>
 
 
 #define DRV_NAME	"ipw2200"
 #define DRV_NAME	"ipw2200"
 
 
 #include <linux/workqueue.h>
 #include <linux/workqueue.h>
 
 
+#include "ieee80211.h"
+
 /* Authentication  and Association States */
 /* Authentication  and Association States */
 enum connection_manager_assoc_states {
 enum connection_manager_assoc_states {
 	CMAS_INIT = 0,
 	CMAS_INIT = 0,

+ 1 - 1
drivers/net/wireless/ipw2x00/libipw_geo.c

@@ -41,7 +41,7 @@
 #include <linux/etherdevice.h>
 #include <linux/etherdevice.h>
 #include <asm/uaccess.h>
 #include <asm/uaccess.h>
 
 
-#include <net/ieee80211.h>
+#include "ieee80211.h"
 
 
 int ieee80211_is_valid_channel(struct ieee80211_device *ieee, u8 channel)
 int ieee80211_is_valid_channel(struct ieee80211_device *ieee, u8 channel)
 {
 {

+ 1 - 1
drivers/net/wireless/ipw2x00/libipw_module.c

@@ -50,7 +50,7 @@
 #include <net/net_namespace.h>
 #include <net/net_namespace.h>
 #include <net/arp.h>
 #include <net/arp.h>
 
 
-#include <net/ieee80211.h>
+#include "ieee80211.h"
 
 
 #define DRV_DESCRIPTION "802.11 data/management/control stack"
 #define DRV_DESCRIPTION "802.11 data/management/control stack"
 #define DRV_NAME        "ieee80211"
 #define DRV_NAME        "ieee80211"

+ 2 - 1
drivers/net/wireless/ipw2x00/libipw_rx.c

@@ -33,7 +33,8 @@
 #include <linux/ctype.h>
 #include <linux/ctype.h>
 
 
 #include <net/lib80211.h>
 #include <net/lib80211.h>
-#include <net/ieee80211.h>
+
+#include "ieee80211.h"
 
 
 static void ieee80211_monitor_rx(struct ieee80211_device *ieee,
 static void ieee80211_monitor_rx(struct ieee80211_device *ieee,
 					struct sk_buff *skb,
 					struct sk_buff *skb,

+ 1 - 1
drivers/net/wireless/ipw2x00/libipw_tx.c

@@ -41,7 +41,7 @@
 #include <linux/etherdevice.h>
 #include <linux/etherdevice.h>
 #include <asm/uaccess.h>
 #include <asm/uaccess.h>
 
 
-#include <net/ieee80211.h>
+#include "ieee80211.h"
 
 
 /*
 /*
 
 

+ 2 - 1
drivers/net/wireless/ipw2x00/libipw_wx.c

@@ -35,9 +35,10 @@
 #include <linux/jiffies.h>
 #include <linux/jiffies.h>
 
 
 #include <net/lib80211.h>
 #include <net/lib80211.h>
-#include <net/ieee80211.h>
 #include <linux/wireless.h>
 #include <linux/wireless.h>
 
 
+#include "ieee80211.h"
+
 static const char *ieee80211_modes[] = {
 static const char *ieee80211_modes[] = {
 	"?", "a", "b", "ab", "g", "ag", "bg", "abg"
 	"?", "a", "b", "ab", "g", "ag", "bg", "abg"
 };
 };