From 187a769636b6d06d8bd31b273df5ab50eb45d344 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Mon, 27 Oct 2008 11:13:58 -0400 Subject: Staging: wlan-ng: Make wlan-ng use WEXT mode by default. As this is the kernel default mode. Signed-off-by: Solomon Peachy Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wlan-ng/p80211mod.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/staging/wlan-ng/p80211mod.c') diff --git a/drivers/staging/wlan-ng/p80211mod.c b/drivers/staging/wlan-ng/p80211mod.c index e2c3f63..605c11b 100644 --- a/drivers/staging/wlan-ng/p80211mod.c +++ b/drivers/staging/wlan-ng/p80211mod.c @@ -109,7 +109,7 @@ int wlan_watchdog = 5000; module_param(wlan_watchdog, int, 0644); MODULE_PARM_DESC(wlan_watchdog, "transmit timeout in milliseconds"); -int wlan_wext_write = 0; +int wlan_wext_write = 1; #if WIRELESS_EXT > 12 module_param(wlan_wext_write, int, 0644); MODULE_PARM_DESC(wlan_wext_write, "enable write wireless extensions"); -- cgit v1.1 From 68a193e4bb4e96fa58d11566b75bb9bcc34ea50b Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Mon, 27 Oct 2008 11:13:59 -0400 Subject: Staging: wlan-ng: Eliminate more <2.6 kernel support. Signed-off-by: Solomon Peachy Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wlan-ng/p80211mod.c | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'drivers/staging/wlan-ng/p80211mod.c') diff --git a/drivers/staging/wlan-ng/p80211mod.c b/drivers/staging/wlan-ng/p80211mod.c index 605c11b..d1add78 100644 --- a/drivers/staging/wlan-ng/p80211mod.c +++ b/drivers/staging/wlan-ng/p80211mod.c @@ -60,9 +60,7 @@ #include #include -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,25)) #include -#endif #include #include @@ -154,14 +152,7 @@ int init_module(void) { DBFENTER; -#if 0 - printk(KERN_NOTICE "%s (%s) Loaded\n", version, WLAN_BUILD_DATE); -#endif - p80211netdev_startup(); -#ifdef CONFIG_HOTPLUG - p80211_run_sbin_hotplug(NULL, WLAN_HOTPLUG_STARTUP); -#endif DBFEXIT; return 0; @@ -191,11 +182,7 @@ void cleanup_module(void) { DBFENTER; -#ifdef CONFIG_HOTPLUG - p80211_run_sbin_hotplug(NULL, WLAN_HOTPLUG_SHUTDOWN); -#endif p80211netdev_shutdown(); - printk(KERN_NOTICE "%s Unloaded\n", version); DBFEXIT; return; -- cgit v1.1 From 8a1396ef7ee4045bcbf0f9b9d8763e1b383ec690 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Mon, 27 Oct 2008 11:14:00 -0400 Subject: Staging: wlan-ng: Eliminate all backwards-compatibility for <2.6.13 kernels. Signed-off-by: Solomon Peachy Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wlan-ng/p80211mod.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'drivers/staging/wlan-ng/p80211mod.c') diff --git a/drivers/staging/wlan-ng/p80211mod.c b/drivers/staging/wlan-ng/p80211mod.c index d1add78..7a3834e 100644 --- a/drivers/staging/wlan-ng/p80211mod.c +++ b/drivers/staging/wlan-ng/p80211mod.c @@ -97,9 +97,6 @@ /*================================================================*/ /* Local Static Definitions */ -static char *version = "p80211.o: " WLAN_RELEASE; - - /*----------------------------------------------------------------*/ /* --Module Parameters */ @@ -108,10 +105,8 @@ module_param(wlan_watchdog, int, 0644); MODULE_PARM_DESC(wlan_watchdog, "transmit timeout in milliseconds"); int wlan_wext_write = 1; -#if WIRELESS_EXT > 12 module_param(wlan_wext_write, int, 0644); MODULE_PARM_DESC(wlan_wext_write, "enable write wireless extensions"); -#endif #ifdef WLAN_INCLUDE_DEBUG int wlan_debug=0; -- cgit v1.1 From ff1ae8f3c1b972ff850400abdd5f7da36270f408 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Mon, 27 Oct 2008 11:14:05 -0400 Subject: Staging: wlan-ng: Eliminate local 'version.h' The kernel provides us with the proper version of this file. Signed-off-by: Solomon Peachy Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wlan-ng/p80211mod.c | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers/staging/wlan-ng/p80211mod.c') diff --git a/drivers/staging/wlan-ng/p80211mod.c b/drivers/staging/wlan-ng/p80211mod.c index 7a3834e..29cae87 100644 --- a/drivers/staging/wlan-ng/p80211mod.c +++ b/drivers/staging/wlan-ng/p80211mod.c @@ -68,7 +68,6 @@ #include #include -#include "version.h" #include "wlan_compat.h" /*================================================================*/ -- cgit v1.1 From cbec30c4c00c9f5a7357f5c5dacb63ae2378afb4 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Wed, 29 Oct 2008 10:42:57 -0400 Subject: Staging: wlan-ng: Delete a large pile of now-unused code. Signed-off-by: Solomon Peachy Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wlan-ng/p80211mod.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'drivers/staging/wlan-ng/p80211mod.c') diff --git a/drivers/staging/wlan-ng/p80211mod.c b/drivers/staging/wlan-ng/p80211mod.c index 29cae87..80354e3 100644 --- a/drivers/staging/wlan-ng/p80211mod.c +++ b/drivers/staging/wlan-ng/p80211mod.c @@ -188,8 +188,6 @@ EXPORT_SYMBOL(p80211netdev_rx); EXPORT_SYMBOL(unregister_wlandev); EXPORT_SYMBOL(wlan_setup); EXPORT_SYMBOL(wlan_unsetup); -EXPORT_SYMBOL(p80211_suspend); -EXPORT_SYMBOL(p80211_resume); EXPORT_SYMBOL(p80211skb_free); EXPORT_SYMBOL(p80211skb_rxmeta_attach); -- cgit v1.1 From e02c69b8af13938153a3e9470fadce49608170de Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Wed, 29 Oct 2008 10:42:59 -0400 Subject: Staging: wlan-ng: Consolidate wlan-ng into a single module. There's no point in having a separate 'p80211' module, as nobody else is ever going to use it. Push everyting into a single module, and get rid of all exports. Signed-off-by: Solomon Peachy Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wlan-ng/p80211mod.c | 195 ------------------------------------ 1 file changed, 195 deletions(-) delete mode 100644 drivers/staging/wlan-ng/p80211mod.c (limited to 'drivers/staging/wlan-ng/p80211mod.c') diff --git a/drivers/staging/wlan-ng/p80211mod.c b/drivers/staging/wlan-ng/p80211mod.c deleted file mode 100644 index 80354e3..0000000 --- a/drivers/staging/wlan-ng/p80211mod.c +++ /dev/null @@ -1,195 +0,0 @@ -/* src/p80211/p80211mod.c -* -* Module entry and exit for p80211 -* -* Copyright (C) 1999 AbsoluteValue Systems, Inc. All Rights Reserved. -* -------------------------------------------------------------------- -* -* linux-wlan -* -* The contents of this file are subject to the Mozilla Public -* License Version 1.1 (the "License"); you may not use this file -* except in compliance with the License. You may obtain a copy of -* the License at http://www.mozilla.org/MPL/ -* -* Software distributed under the License is distributed on an "AS -* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -* implied. See the License for the specific language governing -* rights and limitations under the License. -* -* Alternatively, the contents of this file may be used under the -* terms of the GNU Public License version 2 (the "GPL"), in which -* case the provisions of the GPL are applicable instead of the -* above. If you wish to allow the use of your version of this file -* only under the terms of the GPL and not to allow others to use -* your version of this file under the MPL, indicate your decision -* by deleting the provisions above and replace them with the notice -* and other provisions required by the GPL. If you do not delete -* the provisions above, a recipient may use your version of this -* file under either the MPL or the GPL. -* -* -------------------------------------------------------------------- -* -* Inquiries regarding the linux-wlan Open Source project can be -* made directly to: -* -* AbsoluteValue Systems Inc. -* info@linux-wlan.com -* http://www.linux-wlan.com -* -* -------------------------------------------------------------------- -* -* Portions of the development of this software were funded by -* Intersil Corporation as part of PRISM(R) chipset product development. -* -* -------------------------------------------------------------------- -* -* This file contains the p80211.o entry and exit points defined for linux -* kernel modules. -* -* Notes: -* - all module parameters for p80211.o should be defined here. -* -* -------------------------------------------------------------------- -*/ - -/*================================================================*/ -/* System Includes */ - - -#include - -#include -#include - -#include -#include -#include -#include -#include - -#include "wlan_compat.h" - -/*================================================================*/ -/* Project Includes */ - -#include "p80211types.h" -#include "p80211hdr.h" -#include "p80211mgmt.h" -#include "p80211conv.h" -#include "p80211msg.h" -#include "p80211netdev.h" -#include "p80211req.h" - -/*================================================================*/ -/* Local Constants */ - - -/*================================================================*/ -/* Local Macros */ - - -/*================================================================*/ -/* Local Types */ - - -/*================================================================*/ -/* Local Static Definitions */ - -/*----------------------------------------------------------------*/ -/* --Module Parameters */ - -int wlan_watchdog = 5000; -module_param(wlan_watchdog, int, 0644); -MODULE_PARM_DESC(wlan_watchdog, "transmit timeout in milliseconds"); - -int wlan_wext_write = 1; -module_param(wlan_wext_write, int, 0644); -MODULE_PARM_DESC(wlan_wext_write, "enable write wireless extensions"); - -#ifdef WLAN_INCLUDE_DEBUG -int wlan_debug=0; -module_param(wlan_debug, int, 0644); -MODULE_PARM_DESC(wlan_debug, "p80211 debug level"); -#endif - -MODULE_LICENSE("Dual MPL/GPL"); - -/*================================================================*/ -/* Local Function Declarations */ - -int init_module(void); -void cleanup_module(void); - -/*================================================================*/ -/* Function Definitions */ - -/*---------------------------------------------------------------- -* init_module -* -* Module initialization routine, called once at module load time. -* -* Arguments: -* none -* -* Returns: -* 0 - success -* ~0 - failure, module is unloaded. -* -* Side effects: -* TODO: define -* -* Call context: -* process thread (insmod or modprobe) -----------------------------------------------------------------*/ -int init_module(void) -{ - DBFENTER; - - p80211netdev_startup(); - - DBFEXIT; - return 0; -} - - -/*---------------------------------------------------------------- -* cleanup_module -* -* Called at module unload time. This is our last chance to -* clean up after ourselves. -* -* Arguments: -* none -* -* Returns: -* nothing -* -* Side effects: -* TODO: define -* -* Call context: -* process thread -* -----------------------------------------------------------------*/ -void cleanup_module(void) -{ - DBFENTER; - - p80211netdev_shutdown(); - - DBFEXIT; - return; -} - -EXPORT_SYMBOL(p80211netdev_hwremoved); -EXPORT_SYMBOL(register_wlandev); -EXPORT_SYMBOL(p80211netdev_rx); -EXPORT_SYMBOL(unregister_wlandev); -EXPORT_SYMBOL(wlan_setup); -EXPORT_SYMBOL(wlan_unsetup); - -EXPORT_SYMBOL(p80211skb_free); -EXPORT_SYMBOL(p80211skb_rxmeta_attach); - -EXPORT_SYMBOL(p80211wext_event_associated); -- cgit v1.1