diff -ru hostap-driver-0.4.9/driver/modules/hostap_ap.c /opt/hostap-driver-0.4.9/driver/modules/hostap_ap.c --- hostap-driver-0.4.9/driver/modules/hostap_ap.c 2006-04-17 03:09:05.000000000 +0200 +++ /opt/hostap-driver-0.4.9/driver/modules/hostap_ap.c 2006-12-06 01:06:21.000000000 +0100 @@ -18,22 +18,22 @@ static int other_ap_policy[MAX_PARM_DEVICES] = { AP_OTHER_AP_SKIP_ALL, DEF_INTS }; -MODULE_PARM(other_ap_policy, PARM_MIN_MAX "i"); +MODULE_PARM_DESC(other_ap_policy, PARM_MIN_MAX "i"); MODULE_PARM_DESC(other_ap_policy, "Other AP beacon monitoring policy (0-3)"); static int ap_max_inactivity[MAX_PARM_DEVICES] = { AP_MAX_INACTIVITY_SEC, DEF_INTS }; -MODULE_PARM(ap_max_inactivity, PARM_MIN_MAX "i"); +MODULE_PARM_DESC(ap_max_inactivity, PARM_MIN_MAX "i"); MODULE_PARM_DESC(ap_max_inactivity, "AP timeout (in seconds) for station " "inactivity"); static int ap_bridge_packets[MAX_PARM_DEVICES] = { 1, DEF_INTS }; -MODULE_PARM(ap_bridge_packets, PARM_MIN_MAX "i"); +MODULE_PARM_DESC(ap_bridge_packets, PARM_MIN_MAX "i"); MODULE_PARM_DESC(ap_bridge_packets, "Bridge packets directly between " "stations"); static int autom_ap_wds[MAX_PARM_DEVICES] = { 0, DEF_INTS }; -MODULE_PARM(autom_ap_wds, PARM_MIN_MAX "i"); +MODULE_PARM_DESC(autom_ap_wds, PARM_MIN_MAX "i"); MODULE_PARM_DESC(autom_ap_wds, "Add WDS connections to other APs " "automatically"); diff -ru hostap-driver-0.4.9/driver/modules/hostap.c /opt/hostap-driver-0.4.9/driver/modules/hostap.c --- hostap-driver-0.4.9/driver/modules/hostap.c 2006-04-17 03:16:06.000000000 +0200 +++ /opt/hostap-driver-0.4.9/driver/modules/hostap.c 2006-12-06 00:47:25.000000000 +0100 @@ -41,12 +41,6 @@ #include "hostap.h" #include "hostap_crypt.h" -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14)) -#error Host AP driver was added into Linux 2.6.14. -#error The version used in the kernel tree should be used instead of this -#error external release which is only maintained for old kernel versions. -#endif - MODULE_AUTHOR("Jouni Malinen"); MODULE_DESCRIPTION("Host AP common routines"); MODULE_LICENSE("GPL"); diff -ru hostap-driver-0.4.9/driver/modules/hostap_cs.c /opt/hostap-driver-0.4.9/driver/modules/hostap_cs.c --- hostap-driver-0.4.9/driver/modules/hostap_cs.c 2006-05-07 06:04:38.000000000 +0200 +++ /opt/hostap-driver-0.4.9/driver/modules/hostap_cs.c 2006-12-06 01:08:32.000000000 +0100 @@ -37,11 +37,6 @@ #include #endif /* __IN_PCMCIA_PACKAGE__ */ -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14)) -#error Host AP driver was added into Linux 2.6.14. -#error The version used in the kernel tree should be used instead of this -#error external release which is only maintained for old kernel versions. -#endif static char *version = PRISM2_VERSION " (Jouni Malinen )"; static dev_info_t dev_info = "hostap_cs"; @@ -59,14 +54,14 @@ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)) static unsigned int irq_mask = 0xdeb8; -MODULE_PARM(irq_mask, "i"); +MODULE_PARM_DESC(irq_mask, "i"); static int irq_list[4] = { -1 }; -MODULE_PARM(irq_list, "1-4i"); +MODULE_PARM_DESC(irq_list, "1-4i"); #endif static int ignore_cis_vcc = 0; -MODULE_PARM(ignore_cis_vcc, "i"); +MODULE_PARM_DESC(ignore_cis_vcc, "i"); MODULE_PARM_DESC(ignore_cis_vcc, "Ignore broken CIS VCC entry"); diff -ru hostap-driver-0.4.9/driver/modules/hostap_hw.c /opt/hostap-driver-0.4.9/driver/modules/hostap_hw.c --- hostap-driver-0.4.9/driver/modules/hostap_hw.c 2006-04-17 03:10:36.000000000 +0200 +++ /opt/hostap-driver-0.4.9/driver/modules/hostap_hw.c 2006-12-06 01:09:22.000000000 +0100 @@ -58,43 +58,43 @@ /* #define final_version */ static int mtu = 1500; -MODULE_PARM(mtu, "i"); +MODULE_PARM_DESC(mtu, "i"); MODULE_PARM_DESC(mtu, "Maximum transfer unit"); static int channel[MAX_PARM_DEVICES] = { 3, DEF_INTS }; -MODULE_PARM(channel, PARM_MIN_MAX "i"); +MODULE_PARM_DESC(channel, PARM_MIN_MAX "i"); MODULE_PARM_DESC(channel, "Initial channel"); static char *essid[MAX_PARM_DEVICES] = { "test" }; -MODULE_PARM(essid, PARM_MIN_MAX "s"); +MODULE_PARM_DESC(essid, PARM_MIN_MAX "s"); MODULE_PARM_DESC(essid, "Host AP's ESSID"); static int iw_mode[MAX_PARM_DEVICES] = { IW_MODE_MASTER, DEF_INTS }; -MODULE_PARM(iw_mode, PARM_MIN_MAX "i"); +MODULE_PARM_DESC(iw_mode, PARM_MIN_MAX "i"); MODULE_PARM_DESC(iw_mode, "Initial operation mode"); static int beacon_int[MAX_PARM_DEVICES] = { 100, DEF_INTS }; -MODULE_PARM(beacon_int, PARM_MIN_MAX "i"); +MODULE_PARM_DESC(beacon_int, PARM_MIN_MAX "i"); MODULE_PARM_DESC(beacon_int, "Beacon interval (1 = 1024 usec)"); static int dtim_period[MAX_PARM_DEVICES] = { 1, DEF_INTS }; -MODULE_PARM(dtim_period, PARM_MIN_MAX "i"); +MODULE_PARM_DESC(dtim_period, PARM_MIN_MAX "i"); MODULE_PARM_DESC(dtim_period, "DTIM period"); #if defined(PRISM2_PCI) && defined(PRISM2_BUS_MASTER) static int bus_master_threshold_rx[MAX_PARM_DEVICES] = { 100, DEF_INTS }; -MODULE_PARM(bus_master_threshold_rx, "i"); +MODULE_PARM_DESC(bus_master_threshold_rx, "i"); MODULE_PARM_DESC(bus_master_threshold_rx, "Packet length threshold for using " "PCI bus master on RX"); static int bus_master_threshold_tx[MAX_PARM_DEVICES] = { 100, DEF_INTS }; -MODULE_PARM(bus_master_threshold_tx, "i"); +MODULE_PARM_DESC(bus_master_threshold_tx, "i"); MODULE_PARM_DESC(bus_master_threshold_tx, "Packet length threshold for using " "PCI bus master on TX"); #endif /* PRISM2_PCI and PRISM2_BUS_MASTER */ static char *dev_template = "wlan%d"; -MODULE_PARM(dev_template, "s"); +MODULE_PARM_DESC(dev_template, "s"); MODULE_PARM_DESC(dev_template, "Prefix for network device name (default: " "wlan%d)"); diff -ru hostap-driver-0.4.9/driver/modules/hostap_pci.c /opt/hostap-driver-0.4.9/driver/modules/hostap_pci.c --- hostap-driver-0.4.9/driver/modules/hostap_pci.c 2006-05-07 06:04:38.000000000 +0200 +++ /opt/hostap-driver-0.4.9/driver/modules/hostap_pci.c 2006-12-06 00:47:55.000000000 +0100 @@ -24,11 +24,6 @@ #include "hostap_wlan.h" -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14)) -#error Host AP driver was added into Linux 2.6.14. -#error The version used in the kernel tree should be used instead of this -#error external release which is only maintained for old kernel versions. -#endif static char *version = PRISM2_VERSION " (Jouni Malinen )"; static char *dev_info = "hostap_pci"; diff -ru hostap-driver-0.4.9/driver/modules/hostap_plx.c /opt/hostap-driver-0.4.9/driver/modules/hostap_plx.c --- hostap-driver-0.4.9/driver/modules/hostap_plx.c 2006-05-07 06:04:38.000000000 +0200 +++ /opt/hostap-driver-0.4.9/driver/modules/hostap_plx.c 2006-12-06 01:43:17.000000000 +0100 @@ -27,11 +27,6 @@ #include "hostap_wlan.h" -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14)) -#error Host AP driver was added into Linux 2.6.14. -#error The version used in the kernel tree should be used instead of this -#error external release which is only maintained for old kernel versions. -#endif static char *version = PRISM2_VERSION " (Jouni Malinen )"; static char *dev_info = "hostap_plx"; @@ -47,7 +42,7 @@ #endif static int ignore_cis = 0; -MODULE_PARM(ignore_cis, "i"); +MODULE_PARM_DESC(ignore_cis, "i"); MODULE_PARM_DESC(ignore_cis, "Do not verify manfid information in CIS"); diff -ru hostap-driver-0.4.9/driver/modules/Makefile /opt/hostap-driver-0.4.9/driver/modules/Makefile --- hostap-driver-0.4.9/driver/modules/Makefile 2003-11-24 04:03:46.000000000 +0100 +++ /opt/hostap-driver-0.4.9/driver/modules/Makefile 2006-12-06 01:42:45.000000000 +0100 @@ -5,7 +5,7 @@ obj-m += hostap.o hostap_crypt_wep.o hostap_crypt_tkip.o hostap_crypt_ccmp.o ## obj-m += hostap_crypt.o -obj-m += hostap_cs.o +#obj-m += hostap_cs.o obj-m += hostap_plx.o obj-m += hostap_pci.o --- hostap-driver-0.4.9/Makefile 2005-03-19 05:17:28.000000000 +0100 +++ /opt/hostap-driver-0.4.9/Makefile 2006-12-06 00:50:06.000000000 +0100 @@ -111,8 +111,7 @@ echo "*** Can't build for 2.6 with a non-2.6 source!"; \ exit 1; \ fi - $(MAKE) -C $(KERNEL_PATH) SUBDIRS=$(PWD)/driver/modules \ - MODVERDIR=$(PWD)/driver/modules modules + $(MAKE) -C $(KERNEL_PATH) SUBDIRS=$(PWD)/driver/modules $(MAKE) install_all_info SRC=$(MSRC)/hostap_hw.c $(MSRC)/hostap_wlan.h $(MSRC)/hostap_config.h \