[wireless] build fixes after merging WE-19

diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 89c2ff9570d5e57f953d2283df541f8aeb614e9a..2be65d308fbeab14e24f759a2da5ebca6b90c8bf 100644 (file)
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -6867,7 +6867,7 @@ static inline char *airo_translate_scan(struct net_device *dev,
        } else {
                iwe.u.qual.level = (bss->dBm + 321) / 2;
                iwe.u.qual.qual = 0;
-               iwe.u.qual.updated = IW_QUAL_QUAL_INVALID;
+               iwe.u.qual.updated = IW_QUAL_QUAL_INVALID
                                | IW_QUAL_LEVEL_UPDATED
                                | IW_QUAL_DBM;
        }

diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 74d66eeddef208a610d0bc1256f193cef9cd643b..e9c5ea0f5535dada4e4416fdad26d81caa6de948 100644 (file)
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -53,6 +53,7 @@
 #include <pcmcia/ds.h>
 #include <pcmcia/mem_op.h>
 
+#include <net/ieee80211.h>
 #include <linux/wireless.h>
 
 #include <asm/io.h>

diff --git a/include/linux/wireless.h b/include/linux/wireless.h
index dab5afdaf71cf663c60001bc948158455861a4bd..a555a0f7a7b4ec6d42015c60c4117c862c4d99e3 100644 (file)
--- a/include/linux/wireless.h
+++ b/include/linux/wireless.h
@@ -69,12 +69,9 @@
 
 /***************************** INCLUDES *****************************/
 
-/* Do not put any header in this file, this creates a mess when
- * exported to user space. Most users have included all the
- * relevant headers anyway... Jean II */
-/*#include <linux/types.h>*/           /* for "caddr_t" et al          */
-/*#include <linux/socket.h>*/          /* for "struct sockaddr" et al  */
-/*#include <linux/if.h>*/              /* for IFNAMSIZ and co... */
+#include <linux/types.h>               /* for "caddr_t" et al          */
+#include <linux/socket.h>              /* for "struct sockaddr" et al  */
+#include <linux/if.h>                  /* for IFNAMSIZ and co... */
 
 /***************************** VERSION *****************************/
 /*

diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
index 2cd571c525a96cb4cad449f731479b15e582d972..510a1716a4f05e6cca080126df33dedc571f4a0f 100644 (file)
--- a/net/ieee80211/ieee80211_wx.c
+++ b/net/ieee80211/ieee80211_wx.c
@@ -29,12 +29,13 @@
   Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
 
 ******************************************************************************/
-#include <linux/wireless.h>
-#include <linux/version.h>
+
 #include <linux/kmod.h>
 #include <linux/module.h>
 
 #include <net/ieee80211.h>
+#include <linux/wireless.h>
+
 static const char *ieee80211_modes[] = {
        "?", "a", "b", "ab", "g", "ag", "bg", "abg"
 };