: Wireless Kconfig cleanup
Subsystems (4)
PATCH 1/1 : Wireless Kconfig cleanup
Hi Jeff,
In kernel 2.5.63, you have moved more wireless LAN drivers
into ../drivers/net/wireless/. Unfortunately, there was a bit more to cleanup as the result of this work.
You will need to :
o Apply the attached patch
o rm /drivers/net/pcmcia/aironet4500_cs.c
Have fun...
Jean
P.S. : You will notice that I took the liberty to organise the config option in what I hope is a more logical order.
P.S.2 : Did you receive my IrDA patches ?
-------------------------------------------------------------------
net/core/Makefile renamed from net-j1/core/Makefile +0 -2
@@ -19,5 +19,3 @@ obj-$(CONFIG_NET_DIVERT) += dv.o obj-$(CONFIG_NET_PROFILE) += profile.o obj-$(CONFIG_NET_PKTGEN) += pktgen.o obj-$(CONFIG_NET_RADIO) += wireless.o -# Ugly. I wish all wireless drivers were moved in drivers/net/wireless -obj-$(CONFIG_NET_PCMCIA_RADIO) += wireless.o
net/core/dev.c renamed from net-j1/core/dev.c +2 -2
@@ -107,10 +107,10 @@#include <linux/kmod.h> #include <linux/module.h> #include <linux/kallsyms.h> -#if defined(CONFIG_NET_RADIO ) || defined(CONFIG_NET_PCMCIA_RADIO ) +#ifdef CONFIG_NET_RADIO #include <linux/wireless.h> /* Note : will define WIRELESS_EXT */ #include <net/iw_handler.h> -#endif /* CONFIG_NET_RADIO || CONFIG_NET_PCMCIA_RADIO */ +#endif /* CONFIG_NET_RADIO */ #ifdef CONFIG_PLIP extern int plip_init (void );#endif
net/netsyms.c renamed from net-j1/netsyms.c +2 -2
@@ -646,12 +646,12 @@ EXPORT_SYMBOL(register_gifconf);EXPORT_SYMBOL (softnet_data); -#if defined(CONFIG_NET_RADIO ) || defined(CONFIG_NET_PCMCIA_RADIO ) +#ifdef CONFIG_NET_RADIO /* Don't include the whole header mess for a single function */ union iwreq_data ;extern void wireless_send_event (struct net_device *dev,unsigned int cmd,union iwreq_data *wrqu,char *extra);EXPORT_SYMBOL (wireless_send_event); -#endif /* CONFIG_NET_RADIO || CONFIG_NET_PCMCIA_RADIO */ +#endif /* CONFIG_NET_RADIO */ EXPORT_SYMBOL (linkwatch_fire_event);
net/socket.c renamed from net-j1/socket.c +2 -2
@@ -83,9 +83,9 @@#include <linux/kmod.h> #endif -#if defined(CONFIG_NET_RADIO ) || defined(CONFIG_NET_PCMCIA_RADIO ) +#ifdef CONFIG_NET_RADIO #include <linux/wireless.h> /* Note : will define WIRELESS_EXT */ -#endif /* CONFIG_NET_RADIO || CONFIG_NET_PCMCIA_RADIO */ +#endif /* CONFIG_NET_RADIO */ #include <asm/uaccess.h>
drivers/net/pcmcia/Kconfig renamed from drivers/net/pcmcia-j1/Kconfig +0 -14
@@ -153,19 +153,5 @@ config PCMCIA_IBMTR The module will be called ibmtr_cs. If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. -config AIRONET4500_CS - tristate "Aironet 4500/4800 PCMCIA support" - depends on NET_PCMCIA_RADIO && AIRONET4500 && PCMCIA - help - Say Y here if you have a PCMCIA Aironet 4500/4800 card which you - want to use with the standard PCMCIA cardservices provided by the - pcmcia-cs package. - - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called aironet4500_cs. If you want to - compile it as a module, say M here and read - <file:Documentation/modules.txt>. - endmenu
drivers/net/pcmcia/Makefile renamed from drivers/net/pcmcia-j1/Makefile +0 -3
@@ -13,7 +13,4 @@ obj-$(CONFIG_PCMCIA_XIRC2PS) += xirc2ps_ obj-$(CONFIG_ARCNET_COM20020_CS)+= com20020_cs.o obj-$(CONFIG_PCMCIA_AXNET) += axnet_cs.o -# 16-bit wireless client drivers -obj-$(CONFIG_AIRONET4500_CS) += aironet4500_cs.o - obj-$(CONFIG_PCMCIA_IBMTR) += ibmtr_cs.o
drivers/net/wireless/Kconfig renamed from drivers/net/wireless-j1/Kconfig +57 -66
168 lines not on this page · raw message
drivers/net/wireless/todo.txt renamed from drivers/net/wireless-j1/todo.txt +2 -16
@@ -2,28 +2,14 @@ ------------- 1) Bring other kernel Wireless LAN drivers here - Already done : - o hermes.c/orinoco.c -> Wavelan IEEE driver + Airport driver - o airo.c/airo_cs.c -> Ben's Aironet driver - o wavelan.c -> old Wavelan ISA driver - o wavelan_cs.c -> old Wavelan Pcmcia driver - o netwave_cs.c -> Netwave Pcmcia driver - Drivers likely to go : - o ray_cs.c -> Raytheon/Aviator driver (maintainer MIA) - Drivers I have absolutely no control over : - o arlan.c -> old Aironet Arlan 655 (need to ask Elmer) - o aironet4500_xxx.c -> Elmer's Aironet driver (need to ask Elmer) - o strip.c -> Metricom's stuff. Not a wlan. Hum... - - ETA : Kernel 2.5.X + Completed 2) Bring new Wireless LAN driver not yet in the kernel there See my web page for details + In particular : HostAP 3) Misc o Mark wavelan, wavelan_cs, netwave_cs drivers as obsolete o Maybe arlan.c, ray_cs.c and strip.c also deserve to be obsolete - o Use new Probe/module stuff in wavelan.c - o New Wireless Extension API (pending) Jean II
Jeff Garzik
Appliedapplied, will see to irda patches soon