diff options
| -rw-r--r-- | drivers/net/wireless/arlan-main.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/drivers/net/wireless/arlan-main.c b/drivers/net/wireless/arlan-main.c index 4f304c6e693a..0e1ac338cac1 100644 --- a/drivers/net/wireless/arlan-main.c +++ b/drivers/net/wireless/arlan-main.c | |||
| @@ -33,8 +33,6 @@ static int arlan_EEPROM_bad; | |||
| 33 | 33 | ||
| 34 | #ifdef ARLAN_DEBUGGING | 34 | #ifdef ARLAN_DEBUGGING |
| 35 | 35 | ||
| 36 | static int arlan_entry_debug; | ||
| 37 | static int arlan_exit_debug; | ||
| 38 | static int testMemory = testMemoryUNKNOWN; | 36 | static int testMemory = testMemoryUNKNOWN; |
| 39 | static int irq = irqUNKNOWN; | 37 | static int irq = irqUNKNOWN; |
| 40 | static int txScrambled = 1; | 38 | static int txScrambled = 1; |
| @@ -43,15 +41,13 @@ static int mdebug; | |||
| 43 | module_param(irq, int, 0); | 41 | module_param(irq, int, 0); |
| 44 | module_param(mdebug, int, 0); | 42 | module_param(mdebug, int, 0); |
| 45 | module_param(testMemory, int, 0); | 43 | module_param(testMemory, int, 0); |
| 46 | module_param(arlan_entry_debug, int, 0); | ||
| 47 | module_param(arlan_exit_debug, int, 0); | ||
| 48 | module_param(txScrambled, int, 0); | 44 | module_param(txScrambled, int, 0); |
| 49 | MODULE_PARM_DESC(irq, "(unused)"); | 45 | MODULE_PARM_DESC(irq, "(unused)"); |
| 50 | MODULE_PARM_DESC(testMemory, "(unused)"); | 46 | MODULE_PARM_DESC(testMemory, "(unused)"); |
| 51 | MODULE_PARM_DESC(mdebug, "Arlan multicast debugging (0-1)"); | 47 | MODULE_PARM_DESC(mdebug, "Arlan multicast debugging (0-1)"); |
| 52 | #endif | 48 | #endif |
| 53 | 49 | ||
| 54 | module_param(arlan_debug, int, 0); | 50 | module_param_named(debug, arlan_debug, int, 0); |
| 55 | module_param(spreadingCode, int, 0); | 51 | module_param(spreadingCode, int, 0); |
| 56 | module_param(channelNumber, int, 0); | 52 | module_param(channelNumber, int, 0); |
| 57 | module_param(channelSet, int, 0); | 53 | module_param(channelSet, int, 0); |
| @@ -63,17 +59,19 @@ module_param(keyStart, int, 0); | |||
| 63 | module_param(tx_delay_ms, int, 0); | 59 | module_param(tx_delay_ms, int, 0); |
| 64 | module_param(retries, int, 0); | 60 | module_param(retries, int, 0); |
| 65 | module_param(tx_queue_len, int, 0); | 61 | module_param(tx_queue_len, int, 0); |
| 66 | module_param(arlan_EEPROM_bad, int, 0); | 62 | module_param_named(EEPROM_bad, arlan_EEPROM_bad, int, 0); |
| 67 | MODULE_PARM_DESC(arlan_debug, "Arlan debug enable (0-1)"); | 63 | MODULE_PARM_DESC(debug, "Arlan debug enable (0-1)"); |
| 68 | MODULE_PARM_DESC(retries, "Arlan maximum packet retransmisions"); | 64 | MODULE_PARM_DESC(retries, "Arlan maximum packet retransmisions"); |
| 69 | #ifdef ARLAN_ENTRY_EXIT_DEBUGGING | 65 | #ifdef ARLAN_ENTRY_EXIT_DEBUGGING |
| 70 | MODULE_PARM_DESC(arlan_entry_debug, "Arlan driver function entry debugging"); | 66 | static int arlan_entry_debug; |
| 71 | MODULE_PARM_DESC(arlan_exit_debug, "Arlan driver function exit debugging"); | 67 | static int arlan_exit_debug; |
| 72 | MODULE_PARM_DESC(arlan_entry_and_exit_debug, "Arlan driver function entry and exit debugging"); | 68 | static int arlan_entry_and_exit_debug; |
| 73 | #else | 69 | module_param_named(entry_debug, arlan_entry_debug, int, 0); |
| 74 | MODULE_PARM_DESC(arlan_entry_debug, "(ignored)"); | 70 | module_param_named(exit_debug, arlan_exit_debug, int, 0); |
| 75 | MODULE_PARM_DESC(arlan_exit_debug, "(ignored)"); | 71 | module_param_named(entry_and_exit_debug, arlan_entry_and_exit_debug, int, 0); |
| 76 | MODULE_PARM_DESC(arlan_entry_and_exit_debug, "(ignored)"); | 72 | MODULE_PARM_DESC(entry_debug, "Arlan driver function entry debugging"); |
| 73 | MODULE_PARM_DESC(exit_debug, "Arlan driver function exit debugging"); | ||
| 74 | MODULE_PARM_DESC(entry_and_exit_debug, "Arlan driver function entry and exit debugging"); | ||
| 77 | #endif | 75 | #endif |
| 78 | 76 | ||
| 79 | struct arlan_conf_stru arlan_conf[MAX_ARLANS]; | 77 | struct arlan_conf_stru arlan_conf[MAX_ARLANS]; |
