diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-07 00:27:54 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-07 00:27:54 -0400 |
| commit | bbeec90b98a3066f6f2b8d41c80561f5665e4631 (patch) | |
| tree | 9e7e1d62f5a4b1f0322c8f4bd7e6132aa761c8cc | |
| parent | e345d5ef6d476cc236f64d90d9528143a70745c8 (diff) | |
| download | linux-stable-bbeec90b98a3066f6f2b8d41c80561f5665e4631.tar.gz linux-stable-bbeec90b98a3066f6f2b8d41c80561f5665e4631.tar.bz2 linux-stable-bbeec90b98a3066f6f2b8d41c80561f5665e4631.zip | |
[wireless] build fixes after merging WE-19
| -rw-r--r-- | drivers/net/wireless/airo.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/ray_cs.c | 1 | ||||
| -rw-r--r-- | include/linux/wireless.h | 9 | ||||
| -rw-r--r-- | net/ieee80211/ieee80211_wx.c | 5 |
4 files changed, 8 insertions, 9 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 89c2ff9570d5..2be65d308fbe 100644 --- 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 74d66eeddef2..e9c5ea0f5535 100644 --- 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 dab5afdaf71c..a555a0f7a7b4 100644 --- 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 2cd571c525a9..510a1716a4f0 100644 --- 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" }; |