Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[wireless] build fixes after merging WE-19

+8 -9
+1 -1
drivers/net/wireless/airo.c
··· 6867 6867 } else { 6868 6868 iwe.u.qual.level = (bss->dBm + 321) / 2; 6869 6869 iwe.u.qual.qual = 0; 6870 - iwe.u.qual.updated = IW_QUAL_QUAL_INVALID; 6870 + iwe.u.qual.updated = IW_QUAL_QUAL_INVALID 6871 6871 | IW_QUAL_LEVEL_UPDATED 6872 6872 | IW_QUAL_DBM; 6873 6873 }
+1
drivers/net/wireless/ray_cs.c
··· 53 53 #include <pcmcia/ds.h> 54 54 #include <pcmcia/mem_op.h> 55 55 56 + #include <net/ieee80211.h> 56 57 #include <linux/wireless.h> 57 58 58 59 #include <asm/io.h>
+3 -6
include/linux/wireless.h
··· 69 69 70 70 /***************************** INCLUDES *****************************/ 71 71 72 - /* Do not put any header in this file, this creates a mess when 73 - * exported to user space. Most users have included all the 74 - * relevant headers anyway... Jean II */ 75 - /*#include <linux/types.h>*/ /* for "caddr_t" et al */ 76 - /*#include <linux/socket.h>*/ /* for "struct sockaddr" et al */ 77 - /*#include <linux/if.h>*/ /* for IFNAMSIZ and co... */ 72 + #include <linux/types.h> /* for "caddr_t" et al */ 73 + #include <linux/socket.h> /* for "struct sockaddr" et al */ 74 + #include <linux/if.h> /* for IFNAMSIZ and co... */ 78 75 79 76 /***************************** VERSION *****************************/ 80 77 /*
+3 -2
net/ieee80211/ieee80211_wx.c
··· 29 29 Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 30 30 31 31 ******************************************************************************/ 32 - #include <linux/wireless.h> 33 - #include <linux/version.h> 32 + 34 33 #include <linux/kmod.h> 35 34 #include <linux/module.h> 36 35 37 36 #include <net/ieee80211.h> 37 + #include <linux/wireless.h> 38 + 38 39 static const char *ieee80211_modes[] = { 39 40 "?", "a", "b", "ab", "g", "ag", "bg", "abg" 40 41 };