Commit bbeec90b authored by Jeff Garzik's avatar Jeff Garzik

[wireless] build fixes after merging WE-19

parent e345d5ef
...@@ -6867,7 +6867,7 @@ static inline char *airo_translate_scan(struct net_device *dev, ...@@ -6867,7 +6867,7 @@ static inline char *airo_translate_scan(struct net_device *dev,
} else { } else {
iwe.u.qual.level = (bss->dBm + 321) / 2; iwe.u.qual.level = (bss->dBm + 321) / 2;
iwe.u.qual.qual = 0; 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_LEVEL_UPDATED
| IW_QUAL_DBM; | IW_QUAL_DBM;
} }
......
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
#include <pcmcia/ds.h> #include <pcmcia/ds.h>
#include <pcmcia/mem_op.h> #include <pcmcia/mem_op.h>
#include <net/ieee80211.h>
#include <linux/wireless.h> #include <linux/wireless.h>
#include <asm/io.h> #include <asm/io.h>
......
...@@ -69,12 +69,9 @@ ...@@ -69,12 +69,9 @@
/***************************** INCLUDES *****************************/ /***************************** INCLUDES *****************************/
/* Do not put any header in this file, this creates a mess when #include <linux/types.h> /* for "caddr_t" et al */
* exported to user space. Most users have included all the #include <linux/socket.h> /* for "struct sockaddr" et al */
* relevant headers anyway... Jean II */ #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 *****************************/ /***************************** VERSION *****************************/
/* /*
......
...@@ -29,12 +29,13 @@ ...@@ -29,12 +29,13 @@
Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 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/kmod.h>
#include <linux/module.h> #include <linux/module.h>
#include <net/ieee80211.h> #include <net/ieee80211.h>
#include <linux/wireless.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"
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment