diff options
Diffstat (limited to 'drivers/staging/wlags49_h2/wl_main.c')
| -rw-r--r-- | drivers/staging/wlags49_h2/wl_main.c | 311 |
1 files changed, 140 insertions, 171 deletions
diff --git a/drivers/staging/wlags49_h2/wl_main.c b/drivers/staging/wlags49_h2/wl_main.c index 650def88e5c2..fc98b6dbdb89 100644 --- a/drivers/staging/wlags49_h2/wl_main.c +++ b/drivers/staging/wlags49_h2/wl_main.c @@ -76,38 +76,23 @@ #include <linux/seq_file.h> #include <linux/types.h> #include <linux/kernel.h> -// #include <linux/sched.h> -// #include <linux/ptrace.h> -// #include <linux/slab.h> -// #include <linux/ctype.h> -// #include <linux/string.h> -// #include <linux/timer.h> -//#include <linux/interrupt.h> -// #include <linux/tqueue.h> -// #include <linux/in.h> -// #include <linux/delay.h> -// #include <asm/io.h> -// // #include <asm/bitops.h> #include <linux/unistd.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/netdevice.h> #include <linux/etherdevice.h> -// #include <linux/skbuff.h> -// #include <linux/if_arp.h> -// #include <linux/ioport.h> #define BIN_DL 0 #if BIN_DL #include <linux/vmalloc.h> -#endif // BIN_DL +#endif /* BIN_DL */ #include <debug.h> #include <hcf.h> #include <dhf.h> -//in order to get around:: wl_main.c:2229: `HREG_EV_RDMAD' undeclared (first use in this function) +/* in order to get around:: wl_main.c:2229: `HREG_EV_RDMAD' undeclared (first use in this function) */ #include <hcfdef.h> #include <wl_if.h> @@ -133,8 +118,7 @@ ******************************************************************************/ #define VALID_PARAM(C) \ { \ - if (!(C)) \ - { \ + if (!(C)) { \ printk(KERN_INFO "Wireless, parameter error: \"%s\"\n", #C); \ goto failed; \ } \ @@ -142,7 +126,7 @@ /******************************************************************************* * local functions ******************************************************************************/ -void wl_isr_handler( unsigned long p ); +void wl_isr_handler(unsigned long p); #if 0 //SCULL_USE_PROC /* don't waste space if unused */ static int scull_read_procmem(struct seq_file *m, void *v); @@ -168,7 +152,7 @@ static const struct file_operations scull_read_procmem_fops = { /******************************************************************************* * module parameter definitions - set with 'insmod' ******************************************************************************/ -static p_u16 irq_mask = 0xdeb8; // IRQ3,4,5,7,9,10,11,12,14,15 +static p_u16 irq_mask = 0xdeb8; /* IRQ3,4,5,7,9,10,11,12,14,15 */ static p_s8 irq_list[4] = { -1 }; #if 0 @@ -183,7 +167,7 @@ static p_u16 PARM_AUTH_KEY_MGMT_SUITE = PARM_DEFAULT_AUTH_KEY_MGMT_SUITE; static p_u16 PARM_BRSC_2GHZ = PARM_DEFAULT_BRSC_2GHZ; static p_u16 PARM_BRSC_5GHZ = PARM_DEFAULT_BRSC_5GHZ; static p_u16 PARM_COEXISTENCE = PARM_DEFAULT_COEXISTENCE; -static p_u16 PARM_CONNECTION_CONTROL = PARM_DEFAULT_CONNECTION_CONTROL; //;?rename and move +static p_u16 PARM_CONNECTION_CONTROL = PARM_DEFAULT_CONNECTION_CONTROL; /* ;?rename and move */ static p_char *PARM_CREATE_IBSS = PARM_DEFAULT_CREATE_IBSS_STR; static p_char *PARM_DESIRED_SSID = PARM_DEFAULT_SSID; static p_char *PARM_DOWNLOAD_FIRMWARE = ""; @@ -220,7 +204,7 @@ static p_u16 PARM_RTS_THRESHOLD3 = PARM_DEFAULT_RTS_THRESHOLD; static p_u16 PARM_RTS_THRESHOLD4 = PARM_DEFAULT_RTS_THRESHOLD; static p_u16 PARM_RTS_THRESHOLD5 = PARM_DEFAULT_RTS_THRESHOLD; static p_u16 PARM_RTS_THRESHOLD6 = PARM_DEFAULT_RTS_THRESHOLD; -#endif // USE_WDS +#endif /* USE_WDS */ static p_u16 PARM_RTS_THRESHOLD = PARM_DEFAULT_RTS_THRESHOLD; static p_u16 PARM_SRSC_2GHZ = PARM_DEFAULT_SRSC_2GHZ; static p_u16 PARM_SRSC_5GHZ = PARM_DEFAULT_SRSC_5GHZ; @@ -234,7 +218,7 @@ static p_u16 PARM_TX_RATE3 = PARM_DEFAULT_TX_RATE_2GHZ; static p_u16 PARM_TX_RATE4 = PARM_DEFAULT_TX_RATE_2GHZ; static p_u16 PARM_TX_RATE5 = PARM_DEFAULT_TX_RATE_2GHZ; static p_u16 PARM_TX_RATE6 = PARM_DEFAULT_TX_RATE_2GHZ; -#endif // USE_WDS +#endif /* USE_WDS */ static p_u16 PARM_TX_RATE = PARM_DEFAULT_TX_RATE_2GHZ; #ifdef USE_WDS static p_u8 PARM_WDS_ADDRESS1[ETH_ALEN] = PARM_DEFAULT_NETWORK_ADDR; @@ -243,7 +227,7 @@ static p_u8 PARM_WDS_ADDRESS3[ETH_ALEN] = PARM_DEFAULT_NETWORK_ADDR; static p_u8 PARM_WDS_ADDRESS4[ETH_ALEN] = PARM_DEFAULT_NETWORK_ADDR; static p_u8 PARM_WDS_ADDRESS5[ETH_ALEN] = PARM_DEFAULT_NETWORK_ADDR; static p_u8 PARM_WDS_ADDRESS6[ETH_ALEN] = PARM_DEFAULT_NETWORK_ADDR; -#endif // USE_WDS +#endif /* USE_WDS */ #if 0 @@ -299,39 +283,41 @@ MODULE_PARM(PARM_BRSC_2GHZ, "b"); MODULE_PARM_DESC(PARM_BRSC_2GHZ, "Basic Rate Set Control 2.4 GHz"); MODULE_PARM(PARM_BRSC_5GHZ, "b"); MODULE_PARM_DESC(PARM_BRSC_5GHZ, "Basic Rate Set Control 5.0 GHz"); -#if 1 //;? (HCF_TYPE) & HCF_TYPE_STA -//;?seems reasonable that even an AP-only driver could afford this small additional footprint +#if 1 /* (HCF_TYPE) & HCF_TYPE_STA */ +/* ;?seems reasonable that even an AP-only driver could afford this small additional footprint */ MODULE_PARM(PARM_PM_ENABLED, "h"); MODULE_PARM_DESC(PARM_PM_ENABLED, "Power Management State (0 - 2, 8001 - 8002) [0]"); MODULE_PARM(PARM_PORT_TYPE, "b"); MODULE_PARM_DESC(PARM_PORT_TYPE, "Port Type (1 - 3) [1]"); -//;?MODULE_PARM(PARM_CREATE_IBSS, "s"); -//;?MODULE_PARM_DESC(PARM_CREATE_IBSS, "Create IBSS (<string> N or Y) [N]"); -//;?MODULE_PARM(PARM_MULTICAST_RX, "s"); -//;?MODULE_PARM_DESC(PARM_MULTICAST_RX, "Multicast Receive Enable (<string> N or Y) [Y]"); -//;?MODULE_PARM(PARM_MAX_SLEEP, "h"); -//;?MODULE_PARM_DESC(PARM_MAX_SLEEP, "Maximum Power Management Sleep Duration (0 - 65535) [100]"); -//;?MODULE_PARM(PARM_NETWORK_ADDR, "6b"); -//;?MODULE_PARM_DESC(PARM_NETWORK_ADDR, "Hardware Ethernet Address ([0x00-0xff],[0x00-0xff],[0x00-0xff],[0x00-0xff],[0x00-0xff],[0x00-0xff]) [<factory value>]"); -//;?MODULE_PARM(PARM_AUTHENTICATION, "b"); -// -//tracker 12448 -//;?MODULE_PARM_DESC(PARM_AUTHENTICATION, "Authentication Type (0-2) [0] 0=Open 1=SharedKey 2=LEAP"); -//;?MODULE_PARM_DESC(authentication, "Authentication Type (1-2) [1] 1=Open 2=SharedKey"); -//tracker 12448 -// -//;?MODULE_PARM(PARM_OWN_ATIM_WINDOW, "b"); -//;?MODULE_PARM_DESC(PARM_OWN_ATIM_WINDOW, "ATIM Window time in TU for IBSS creation (0-100) [0]"); -//;?MODULE_PARM(PARM_PM_HOLDOVER_DURATION, "b"); -//;?MODULE_PARM_DESC(PARM_PM_HOLDOVER_DURATION, "Time station remains awake after MAC frame transfer when PM is on (0-65535) [100]"); -//;?MODULE_PARM(PARM_PROMISCUOUS_MODE, "s"); -//;?MODULE_PARM_DESC(PARM_PROMISCUOUS_MODE, "Promiscuous Mode Enable (<string> Y or N ) [N]" ); -//;? +/* + * ;?MODULE_PARM(PARM_CREATE_IBSS, "s"); + *;?MODULE_PARM_DESC(PARM_CREATE_IBSS, "Create IBSS (<string> N or Y) [N]"); + *;?MODULE_PARM(PARM_MULTICAST_RX, "s"); + *;?MODULE_PARM_DESC(PARM_MULTICAST_RX, "Multicast Receive Enable (<string> N or Y) [Y]"); + *;?MODULE_PARM(PARM_MAX_SLEEP, "h"); + *;?MODULE_PARM_DESC(PARM_MAX_SLEEP, "Maximum Power Management Sleep Duration (0 - 65535) [100]"); + *;?MODULE_PARM(PARM_NETWORK_ADDR, "6b"); + *;?MODULE_PARM_DESC(PARM_NETWORK_ADDR, "Hardware Ethernet Address ([0x00-0xff],[0x00-0xff],[0x00-0xff],[0x00-0xff],[0x00-0xff],[0x00-0xff]) [<factory value>]"); + *;?MODULE_PARM(PARM_AUTHENTICATION, "b"); + * + *tracker 12448 + *;?MODULE_PARM_DESC(PARM_AUTHENTICATION, "Authentication Type (0-2) [0] 0=Open 1=SharedKey 2=LEAP"); + *;?MODULE_PARM_DESC(authentication, "Authentication Type (1-2) [1] 1=Open 2=SharedKey"); + *tracker 12448 + * + *;?MODULE_PARM(PARM_OWN_ATIM_WINDOW, "b"); + *;?MODULE_PARM_DESC(PARM_OWN_ATIM_WINDOW, "ATIM Window time in TU for IBSS creation (0-100) [0]"); + *;?MODULE_PARM(PARM_PM_HOLDOVER_DURATION, "b"); + *;?MODULE_PARM_DESC(PARM_PM_HOLDOVER_DURATION, "Time station remains awake after MAC frame transfer when PM is on (0-65535) [100]"); + *;?MODULE_PARM(PARM_PROMISCUOUS_MODE, "s"); + *;?MODULE_PARM_DESC(PARM_PROMISCUOUS_MODE, "Promiscuous Mode Enable (<string> Y or N ) [N]" ); + *;? + */ MODULE_PARM(PARM_CONNECTION_CONTROL, "b"); MODULE_PARM_DESC(PARM_CONNECTION_CONTROL, "Connection Control (0 - 3) [2]"); #endif /* HCF_STA */ -#if 1 //;? (HCF_TYPE) & HCF_TYPE_AP - //;?should we restore this to allow smaller memory footprint +#if 1 /* ;? (HCF_TYPE) & HCF_TYPE_AP */ + /* ;?should we restore this to allow smaller memory footprint */ MODULE_PARM(PARM_OWN_DTIM_PERIOD, "b"); MODULE_PARM_DESC(PARM_OWN_DTIM_PERIOD, "DTIM Period (0 - 255) [1]"); MODULE_PARM(PARM_REJECT_ANY, "s"); @@ -394,11 +380,12 @@ MODULE_PARM_DESC(PARM_COEXISTENCE, "Coexistence (0-7) [0]"); #if DBG static p_u32 pc_debug = DBG_LVL; -//MODULE_PARM(pc_debug, "i"); -/*static ;?conflicts with my understanding of CL parameters and breaks now I moved +/* + * MODULE_PARM(pc_debug, "i"); + *static ;?conflicts with my understanding of CL parameters and breaks now I moved * the correspondig logic to wl_profile - */ p_u32 DebugFlag = ~0; //recognizable "undefined value" rather then DBG_DEFAULTS; -//MODULE_PARM(DebugFlag, "l"); + */ p_u32 DebugFlag = ~0; /* recognizable "undefined value" rather then DBG_DEFAULTS; */ +/* MODULE_PARM(DebugFlag, "l"); */ static struct dbg_info wl_info = { KBUILD_MODNAME, 0, 0 }; struct dbg_info *DbgInfo = &wl_info; @@ -407,8 +394,8 @@ struct dbg_info *DbgInfo = &wl_info; #ifdef USE_RTS static p_char *useRTS = "N"; -MODULE_PARM( useRTS, "s" ); -MODULE_PARM_DESC( useRTS, "Use RTS test interface (<string> N or Y) [N]" ); +MODULE_PARM(useRTS, "s"); +MODULE_PARM_DESC(useRTS, "Use RTS test interface (<string> N or Y) [N]"); #endif /* USE_RTS */ /******************************************************************************* @@ -427,7 +414,7 @@ extern memimage fw_image; // firmware image to be downloaded #endif /* HCF_STA */ -int wl_insert( struct net_device *dev ) +int wl_insert(struct net_device *dev) { int result = 0; int hcf_status = HCF_SUCCESS; @@ -436,10 +423,10 @@ int wl_insert( struct net_device *dev ) struct wl_private *lp = wl_priv(dev); /* Initialize the adapter hardware. */ - memset( &( lp->hcfCtx ), 0, sizeof( IFB_STRCT )); + memset(&(lp->hcfCtx), 0, sizeof(IFB_STRCT)); /* Initialize the adapter parameters. */ - spin_lock_init( &( lp->slock )); + spin_lock_init(&(lp->slock)); /* Initialize states */ //lp->lockcount = 0; //PE1DNN @@ -448,31 +435,31 @@ int wl_insert( struct net_device *dev ) lp->dev = dev; - DBG_PARAM( DbgInfo, "irq_mask", "0x%04x", irq_mask & 0x0FFFF ); - DBG_PARAM( DbgInfo, "irq_list", "0x%02x 0x%02x 0x%02x 0x%02x", + DBG_PARAM(DbgInfo, "irq_mask", "0x%04x", irq_mask & 0x0FFFF); + DBG_PARAM(DbgInfo, "irq_list", "0x%02x 0x%02x 0x%02x 0x%02x", irq_list[0] & 0x0FF, irq_list[1] & 0x0FF, - irq_list[2] & 0x0FF, irq_list[3] & 0x0FF ); - DBG_PARAM( DbgInfo, PARM_NAME_DESIRED_SSID, "\"%s\"", PARM_DESIRED_SSID ); - DBG_PARAM( DbgInfo, PARM_NAME_OWN_SSID, "\"%s\"", PARM_OWN_SSID ); - DBG_PARAM( DbgInfo, PARM_NAME_OWN_CHANNEL, "%d", PARM_OWN_CHANNEL); - DBG_PARAM( DbgInfo, PARM_NAME_SYSTEM_SCALE, "%d", PARM_SYSTEM_SCALE ); - DBG_PARAM( DbgInfo, PARM_NAME_TX_RATE, "%d", PARM_TX_RATE ); - DBG_PARAM( DbgInfo, PARM_NAME_RTS_THRESHOLD, "%d", PARM_RTS_THRESHOLD ); - DBG_PARAM( DbgInfo, PARM_NAME_MICROWAVE_ROBUSTNESS, "\"%s\"", PARM_MICROWAVE_ROBUSTNESS ); - DBG_PARAM( DbgInfo, PARM_NAME_OWN_NAME, "\"%s\"", PARM_OWN_NAME ); + irq_list[2] & 0x0FF, irq_list[3] & 0x0FF); + DBG_PARAM(DbgInfo, PARM_NAME_DESIRED_SSID, "\"%s\"", PARM_DESIRED_SSID); + DBG_PARAM(DbgInfo, PARM_NAME_OWN_SSID, "\"%s\"", PARM_OWN_SSID); + DBG_PARAM(DbgInfo, PARM_NAME_OWN_CHANNEL, "%d", PARM_OWN_CHANNEL); + DBG_PARAM(DbgInfo, PARM_NAME_SYSTEM_SCALE, "%d", PARM_SYSTEM_SCALE); + DBG_PARAM(DbgInfo, PARM_NAME_TX_RATE, "%d", PARM_TX_RATE); + DBG_PARAM(DbgInfo, PARM_NAME_RTS_THRESHOLD, "%d", PARM_RTS_THRESHOLD); + DBG_PARAM(DbgInfo, PARM_NAME_MICROWAVE_ROBUSTNESS, "\"%s\"", PARM_MICROWAVE_ROBUSTNESS); + DBG_PARAM(DbgInfo, PARM_NAME_OWN_NAME, "\"%s\"", PARM_OWN_NAME); //;? DBG_PARAM( DbgInfo, PARM_NAME_ENABLE_ENCRYPTION, "\"%s\"", PARM_ENABLE_ENCRYPTION ); - DBG_PARAM( DbgInfo, PARM_NAME_KEY1, "\"%s\"", PARM_KEY1 ); - DBG_PARAM( DbgInfo, PARM_NAME_KEY2, "\"%s\"", PARM_KEY2 ); - DBG_PARAM( DbgInfo, PARM_NAME_KEY3, "\"%s\"", PARM_KEY3 ); - DBG_PARAM( DbgInfo, PARM_NAME_KEY4, "\"%s\"", PARM_KEY4 ); - DBG_PARAM( DbgInfo, PARM_NAME_TX_KEY, "%d", PARM_TX_KEY ); - DBG_PARAM( DbgInfo, PARM_NAME_MULTICAST_RATE, "%d", PARM_MULTICAST_RATE ); - DBG_PARAM( DbgInfo, PARM_NAME_DOWNLOAD_FIRMWARE, "\"%s\"", PARM_DOWNLOAD_FIRMWARE ); - DBG_PARAM( DbgInfo, PARM_NAME_AUTH_KEY_MGMT_SUITE, "%d", PARM_AUTH_KEY_MGMT_SUITE ); + DBG_PARAM(DbgInfo, PARM_NAME_KEY1, "\"%s\"", PARM_KEY1); + DBG_PARAM(DbgInfo, PARM_NAME_KEY2, "\"%s\"", PARM_KEY2); + DBG_PARAM(DbgInfo, PARM_NAME_KEY3, "\"%s\"", PARM_KEY3); + DBG_PARAM(DbgInfo, PARM_NAME_KEY4, "\"%s\"", PARM_KEY4); + DBG_PARAM(DbgInfo, PARM_NAME_TX_KEY, "%d", PARM_TX_KEY); + DBG_PARAM(DbgInfo, PARM_NAME_MULTICAST_RATE, "%d", PARM_MULTICAST_RATE); + DBG_PARAM(DbgInfo, PARM_NAME_DOWNLOAD_FIRMWARE, "\"%s\"", PARM_DOWNLOAD_FIRMWARE); + DBG_PARAM(DbgInfo, PARM_NAME_AUTH_KEY_MGMT_SUITE, "%d", PARM_AUTH_KEY_MGMT_SUITE); //;?#if (HCF_TYPE) & HCF_TYPE_STA //;?should we make this code conditional depending on in STA mode //;? DBG_PARAM( DbgInfo, PARM_NAME_PORT_TYPE, "%d", PARM_PORT_TYPE ); - DBG_PARAM( DbgInfo, PARM_NAME_PM_ENABLED, "%04x", PARM_PM_ENABLED ); + DBG_PARAM(DbgInfo, PARM_NAME_PM_ENABLED, "%04x", PARM_PM_ENABLED); //;? DBG_PARAM( DbgInfo, PARM_NAME_CREATE_IBSS, "\"%s\"", PARM_CREATE_IBSS ); //;? DBG_PARAM( DbgInfo, PARM_NAME_MULTICAST_RX, "\"%s\"", PARM_MULTICAST_RX ); //;? DBG_PARAM( DbgInfo, PARM_NAME_MAX_SLEEP, "%d", PARM_MAX_SLEEP ); @@ -488,24 +475,24 @@ int wl_insert( struct net_device *dev ) #if 1 //;? (HCF_TYPE) & HCF_TYPE_AP //;?should we restore this to allow smaller memory footprint //;?I guess: no, since this is Debug mode only - DBG_PARAM( DbgInfo, PARM_NAME_OWN_DTIM_PERIOD, "%d", PARM_OWN_DTIM_PERIOD ); - DBG_PARAM( DbgInfo, PARM_NAME_REJECT_ANY, "\"%s\"", PARM_REJECT_ANY ); - DBG_PARAM( DbgInfo, PARM_NAME_EXCLUDE_UNENCRYPTED, "\"%s\"", PARM_EXCLUDE_UNENCRYPTED ); - DBG_PARAM( DbgInfo, PARM_NAME_MULTICAST_PM_BUFFERING, "\"%s\"", PARM_MULTICAST_PM_BUFFERING ); - DBG_PARAM( DbgInfo, PARM_NAME_INTRA_BSS_RELAY, "\"%s\"", PARM_INTRA_BSS_RELAY ); + DBG_PARAM(DbgInfo, PARM_NAME_OWN_DTIM_PERIOD, "%d", PARM_OWN_DTIM_PERIOD); + DBG_PARAM(DbgInfo, PARM_NAME_REJECT_ANY, "\"%s\"", PARM_REJECT_ANY); + DBG_PARAM(DbgInfo, PARM_NAME_EXCLUDE_UNENCRYPTED, "\"%s\"", PARM_EXCLUDE_UNENCRYPTED); + DBG_PARAM(DbgInfo, PARM_NAME_MULTICAST_PM_BUFFERING, "\"%s\"", PARM_MULTICAST_PM_BUFFERING); + DBG_PARAM(DbgInfo, PARM_NAME_INTRA_BSS_RELAY, "\"%s\"", PARM_INTRA_BSS_RELAY); #ifdef USE_WDS - DBG_PARAM( DbgInfo, PARM_NAME_RTS_THRESHOLD1, "%d", PARM_RTS_THRESHOLD1 ); - DBG_PARAM( DbgInfo, PARM_NAME_RTS_THRESHOLD2, "%d", PARM_RTS_THRESHOLD2 ); - DBG_PARAM( DbgInfo, PARM_NAME_RTS_THRESHOLD3, "%d", PARM_RTS_THRESHOLD3 ); - DBG_PARAM( DbgInfo, PARM_NAME_RTS_THRESHOLD4, "%d", PARM_RTS_THRESHOLD4 ); - DBG_PARAM( DbgInfo, PARM_NAME_RTS_THRESHOLD5, "%d", PARM_RTS_THRESHOLD5 ); - DBG_PARAM( DbgInfo, PARM_NAME_RTS_THRESHOLD6, "%d", PARM_RTS_THRESHOLD6 ); - DBG_PARAM( DbgInfo, PARM_NAME_TX_RATE1, "%d", PARM_TX_RATE1 ); - DBG_PARAM( DbgInfo, PARM_NAME_TX_RATE2, "%d", PARM_TX_RATE2 ); - DBG_PARAM( DbgInfo, PARM_NAME_TX_RATE3, "%d", PARM_TX_RATE3 ); - DBG_PARAM( DbgInfo, PARM_NAME_TX_RATE4, "%d", PARM_TX_RATE4 ); - DBG_PARAM( DbgInfo, PARM_NAME_TX_RATE5, "%d", PARM_TX_RATE5 ); - DBG_PARAM( DbgInfo, PARM_NAME_TX_RATE6, "%d", PARM_TX_RATE6 ); + DBG_PARAM(DbgInfo, PARM_NAME_RTS_THRESHOLD1, "%d", PARM_RTS_THRESHOLD1); + DBG_PARAM(DbgInfo, PARM_NAME_RTS_THRESHOLD2, "%d", PARM_RTS_THRESHOLD2); + DBG_PARAM(DbgInfo, PARM_NAME_RTS_THRESHOLD3, "%d", PARM_RTS_THRESHOLD3); + DBG_PARAM(DbgInfo, PARM_NAME_RTS_THRESHOLD4, "%d", PARM_RTS_THRESHOLD4); + DBG_PARAM(DbgInfo, PARM_NAME_RTS_THRESHOLD5, "%d", PARM_RTS_THRESHOLD5); + DBG_PARAM(DbgInfo, PARM_NAME_RTS_THRESHOLD6, "%d", PARM_RTS_THRESHOLD6); + DBG_PARAM(DbgInfo, PARM_NAME_TX_RATE1, "%d", PARM_TX_RATE1); + DBG_PARAM(DbgInfo, PARM_NAME_TX_RATE2, "%d", PARM_TX_RATE2); + DBG_PARAM(DbgInfo, PARM_NAME_TX_RATE3, "%d", PARM_TX_RATE3); + DBG_PARAM(DbgInfo, PARM_NAME_TX_RATE4, "%d", PARM_TX_RATE4); + DBG_PARAM(DbgInfo, PARM_NAME_TX_RATE5, "%d", PARM_TX_RATE5); + DBG_PARAM(DbgInfo, PARM_NAME_TX_RATE6, "%d", PARM_TX_RATE6); DBG_PARAM(DbgInfo, PARM_NAME_WDS_ADDRESS1, "\"%pM\"", PARM_WDS_ADDRESS1); DBG_PARAM(DbgInfo, PARM_NAME_WDS_ADDRESS2, "\"%pM\"", @@ -521,28 +508,28 @@ int wl_insert( struct net_device *dev ) #endif /* USE_WDS */ #endif /* HCF_AP */ - VALID_PARAM( !PARM_DESIRED_SSID || ( strlen( PARM_DESIRED_SSID ) <= PARM_MAX_NAME_LEN )); - VALID_PARAM( !PARM_OWN_SSID || ( strlen( PARM_OWN_SSID ) <= PARM_MAX_NAME_LEN )); - VALID_PARAM(( PARM_OWN_CHANNEL <= PARM_MAX_OWN_CHANNEL )); - VALID_PARAM(( PARM_SYSTEM_SCALE >= PARM_MIN_SYSTEM_SCALE ) && ( PARM_SYSTEM_SCALE <= PARM_MAX_SYSTEM_SCALE )); - VALID_PARAM(( PARM_TX_RATE >= PARM_MIN_TX_RATE ) && ( PARM_TX_RATE <= PARM_MAX_TX_RATE )); - VALID_PARAM(( PARM_RTS_THRESHOLD <= PARM_MAX_RTS_THRESHOLD )); - VALID_PARAM( !PARM_MICROWAVE_ROBUSTNESS || strchr( "NnYy", PARM_MICROWAVE_ROBUSTNESS[0] ) != NULL ); - VALID_PARAM( !PARM_OWN_NAME || ( strlen( PARM_NAME_OWN_NAME ) <= PARM_MAX_NAME_LEN )); - VALID_PARAM(( PARM_ENABLE_ENCRYPTION <= PARM_MAX_ENABLE_ENCRYPTION )); - VALID_PARAM( is_valid_key_string( PARM_KEY1 )); - VALID_PARAM( is_valid_key_string( PARM_KEY2 )); - VALID_PARAM( is_valid_key_string( PARM_KEY3 )); - VALID_PARAM( is_valid_key_string( PARM_KEY4 )); - VALID_PARAM(( PARM_TX_KEY >= PARM_MIN_TX_KEY ) && ( PARM_TX_KEY <= PARM_MAX_TX_KEY )); - - VALID_PARAM(( PARM_MULTICAST_RATE >= PARM_MIN_MULTICAST_RATE ) && - ( PARM_MULTICAST_RATE <= PARM_MAX_MULTICAST_RATE )); - - VALID_PARAM( !PARM_DOWNLOAD_FIRMWARE || ( strlen( PARM_DOWNLOAD_FIRMWARE ) <= 255 /*;?*/ )); - VALID_PARAM(( PARM_AUTH_KEY_MGMT_SUITE < PARM_MAX_AUTH_KEY_MGMT_SUITE )); - - VALID_PARAM( !PARM_LOAD_BALANCING || strchr( "NnYy", PARM_LOAD_BALANCING[0] ) != NULL ); + VALID_PARAM(!PARM_DESIRED_SSID || (strlen(PARM_DESIRED_SSID) <= PARM_MAX_NAME_LEN)); + VALID_PARAM(!PARM_OWN_SSID || (strlen(PARM_OWN_SSID) <= PARM_MAX_NAME_LEN)); + VALID_PARAM((PARM_OWN_CHANNEL <= PARM_MAX_OWN_CHANNEL)); + VALID_PARAM((PARM_SYSTEM_SCALE >= PARM_MIN_SYSTEM_SCALE) && (PARM_SYSTEM_SCALE <= PARM_MAX_SYSTEM_SCALE)); + VALID_PARAM((PARM_TX_RATE >= PARM_MIN_TX_RATE) && (PARM_TX_RATE <= PARM_MAX_TX_RATE)); + VALID_PARAM((PARM_RTS_THRESHOLD <= PARM_MAX_RTS_THRESHOLD)); + VALID_PARAM(!PARM_MICROWAVE_ROBUSTNESS || strchr("NnYy", PARM_MICROWAVE_ROBUSTNESS[0]) != NULL); + VALID_PARAM(!PARM_OWN_NAME || (strlen(PARM_NAME_OWN_NAME) <= PARM_MAX_NAME_LEN)); + VALID_PARAM((PARM_ENABLE_ENCRYPTION <= PARM_MAX_ENABLE_ENCRYPTION)); + VALID_PARAM(is_valid_key_string(PARM_KEY1)); + VALID_PARAM(is_valid_key_string(PARM_KEY2)); + VALID_PARAM(is_valid_key_string(PARM_KEY3)); + VALID_PARAM(is_valid_key_string(PARM_KEY4)); + VALID_PARAM((PARM_TX_KEY >= PARM_MIN_TX_KEY) && (PARM_TX_KEY <= PARM_MAX_TX_KEY)); + + VALID_PARAM((PARM_MULTICAST_RATE >= PARM_MIN_MULTICAST_RATE) && + (PARM_MULTICAST_RATE <= PARM_MAX_MULTICAST_RATE)); + + VALID_PARAM(!PARM_DOWNLOAD_FIRMWARE || (strlen(PARM_DOWNLOAD_FIRMWARE) <= 255 /*;?*/)); + VALID_PARAM((PARM_AUTH_KEY_MGMT_SUITE < PARM_MAX_AUTH_KEY_MGMT_SUITE)); + + VALID_PARAM(!PARM_LOAD_BALANCING || strchr("NnYy", PARM_LOAD_BALANCING[0]) != NULL); VALID_PARAM( !PARM_MEDIUM_DISTRIBUTION || strchr( "NnYy", PARM_MEDIUM_DISTRIBUTION[0] ) != NULL ); VALID_PARAM(( PARM_TX_POW_LEVEL <= PARM_MAX_TX_POW_LEVEL )); @@ -601,33 +588,25 @@ int wl_insert( struct net_device *dev ) lp->MulticastRate[0] = PARM_DEFAULT_MULTICAST_RATE_2GHZ; lp->MulticastRate[1] = PARM_DEFAULT_MULTICAST_RATE_5GHZ; - if ( strchr( "Yy", PARM_MICROWAVE_ROBUSTNESS[0] ) != NULL ) { + if ( strchr( "Yy", PARM_MICROWAVE_ROBUSTNESS[0] ) != NULL ) lp->MicrowaveRobustness = 1; - } else { + else lp->MicrowaveRobustness = 0; - } - if ( PARM_DESIRED_SSID && ( strlen( PARM_DESIRED_SSID ) <= HCF_MAX_NAME_LEN )) { + if ( PARM_DESIRED_SSID && ( strlen( PARM_DESIRED_SSID ) <= HCF_MAX_NAME_LEN )) strcpy( lp->NetworkName, PARM_DESIRED_SSID ); - } - if ( PARM_OWN_SSID && ( strlen( PARM_OWN_SSID ) <= HCF_MAX_NAME_LEN )) { + if ( PARM_OWN_SSID && ( strlen( PARM_OWN_SSID ) <= HCF_MAX_NAME_LEN )) strcpy( lp->NetworkName, PARM_OWN_SSID ); - } - if ( PARM_OWN_NAME && ( strlen( PARM_OWN_NAME ) <= HCF_MAX_NAME_LEN )) { + if ( PARM_OWN_NAME && ( strlen( PARM_OWN_NAME ) <= HCF_MAX_NAME_LEN )) strcpy( lp->StationName, PARM_OWN_NAME ); - } lp->EnableEncryption = PARM_ENABLE_ENCRYPTION; - if ( PARM_KEY1 && ( strlen( PARM_KEY1 ) <= MAX_KEY_LEN )) { + if ( PARM_KEY1 && ( strlen( PARM_KEY1 ) <= MAX_KEY_LEN )) strcpy( lp->Key1, PARM_KEY1 ); - } - if ( PARM_KEY2 && ( strlen( PARM_KEY2 ) <= MAX_KEY_LEN )) { + if ( PARM_KEY2 && ( strlen( PARM_KEY2 ) <= MAX_KEY_LEN )) strcpy( lp->Key2, PARM_KEY2 ); - } - if ( PARM_KEY3 && ( strlen( PARM_KEY3 ) <= MAX_KEY_LEN )) { + if ( PARM_KEY3 && ( strlen( PARM_KEY3 ) <= MAX_KEY_LEN )) strcpy( lp->Key3, PARM_KEY3 ); - } - if ( PARM_KEY4 && ( strlen( PARM_KEY4 ) <= MAX_KEY_LEN )) { + if ( PARM_KEY4 && ( strlen( PARM_KEY4 ) <= MAX_KEY_LEN )) strcpy( lp->Key4, PARM_KEY4 ); - } lp->TransmitKeyID = PARM_TX_KEY; @@ -639,17 +618,15 @@ int wl_insert( struct net_device *dev ) lp->DownloadFirmware = 1 ; //;?to be upgraded PARM_DOWNLOAD_FIRMWARE; lp->AuthKeyMgmtSuite = PARM_AUTH_KEY_MGMT_SUITE; - if ( strchr( "Yy", PARM_LOAD_BALANCING[0] ) != NULL ) { + if ( strchr( "Yy", PARM_LOAD_BALANCING[0] ) != NULL ) lp->loadBalancing = 1; - } else { + else lp->loadBalancing = 0; - } - if ( strchr( "Yy", PARM_MEDIUM_DISTRIBUTION[0] ) != NULL ) { + if ( strchr( "Yy", PARM_MEDIUM_DISTRIBUTION[0] ) != NULL ) lp->mediumDistribution = 1; - } else { + else lp->mediumDistribution = 0; - } lp->txPowLevel = PARM_TX_POW_LEVEL; @@ -665,24 +642,20 @@ int wl_insert( struct net_device *dev ) lp->atimWindow = PARM_OWN_ATIM_WINDOW; lp->holdoverDuration = PARM_PM_HOLDOVER_DURATION; lp->PMEnabled = PARM_PM_ENABLED; //;? - if ( strchr( "Yy", PARM_CREATE_IBSS[0] ) != NULL ) { + if ( strchr( "Yy", PARM_CREATE_IBSS[0] ) != NULL ) lp->CreateIBSS = 1; - } else { + else lp->CreateIBSS = 0; - } - if ( strchr( "Nn", PARM_MULTICAST_RX[0] ) != NULL ) { + if ( strchr( "Nn", PARM_MULTICAST_RX[0] ) != NULL ) lp->MulticastReceive = 0; - } else { + else lp->MulticastReceive = 1; - } - if ( strchr( "Yy", PARM_PROMISCUOUS_MODE[0] ) != NULL ) { + if ( strchr( "Yy", PARM_PROMISCUOUS_MODE[0] ) != NULL ) lp->promiscuousMode = 1; - } else { + else lp->promiscuousMode = 0; - } - for( i = 0; i < ETH_ALEN; i++ ) { - lp->MACAddress[i] = PARM_NETWORK_ADDR[i]; - } + for( i = 0; i < ETH_ALEN; i++ ) + lp->MACAddress[i] = PARM_NETWORK_ADDR[i]; lp->connectionControl = PARM_CONNECTION_CONTROL; @@ -691,26 +664,22 @@ int wl_insert( struct net_device *dev ) //;?should we restore this to allow smaller memory footprint lp->DTIMPeriod = PARM_OWN_DTIM_PERIOD; - if ( strchr( "Yy", PARM_REJECT_ANY[0] ) != NULL ) { + if ( strchr( "Yy", PARM_REJECT_ANY[0] ) != NULL ) lp->RejectAny = 1; - } else { + else lp->RejectAny = 0; - } - if ( strchr( "Nn", PARM_EXCLUDE_UNENCRYPTED[0] ) != NULL ) { + if ( strchr( "Nn", PARM_EXCLUDE_UNENCRYPTED[0] ) != NULL ) lp->ExcludeUnencrypted = 0; - } else { + else lp->ExcludeUnencrypted = 1; - } - if ( strchr( "Yy", PARM_MULTICAST_PM_BUFFERING[0] ) != NULL ) { + if ( strchr( "Yy", PARM_MULTICAST_PM_BUFFERING[0] ) != NULL ) lp->multicastPMBuffering = 1; - } else { + else lp->multicastPMBuffering = 0; - } - if ( strchr( "Yy", PARM_INTRA_BSS_RELAY[0] ) != NULL ) { + if ( strchr( "Yy", PARM_INTRA_BSS_RELAY[0] ) != NULL ) lp->intraBSSRelay = 1; - } else { + else lp->intraBSSRelay = 0; - } lp->ownBeaconInterval = PARM_OWN_BEACON_INTERVAL; lp->coexistence = PARM_COEXISTENCE; @@ -750,11 +719,10 @@ int wl_insert( struct net_device *dev ) #endif /* USE_WDS */ #endif /* HCF_AP */ #ifdef USE_RTS - if ( strchr( "Yy", useRTS[0] ) != NULL ) { + if ( strchr( "Yy", useRTS[0] ) != NULL ) lp->useRTS = 1; - } else { + else lp->useRTS = 0; - } #endif /* USE_RTS */ @@ -1560,7 +1528,8 @@ int wl_put_ltv( struct wl_private *lp ) hcf_status = hcf_put_info( &lp->hcfCtx, (LTVP)&( lp->ltvRecord )); /* Own Name (Station Nickname) */ - if (( len = ( strlen( lp->StationName ) + 1 ) & ~0x01 ) != 0 ) { + len = (strlen(lp->StationName) + 1) & ~0x01; + if (len != 0) { //DBG_TRACE( DbgInfo, "CFG_CNF_OWN_NAME : %s\n", // lp->StationName ); |