diff options
author | Zhu Yi <yi.zhu@intel.com> | 2006-04-13 05:19:36 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-04-24 16:15:55 -0400 |
commit | d2b83e1214a8395ee18e028d4526cffe9d2eb4ad (patch) | |
tree | 883bb1cfe11a76e92dfcc6b6dc40a4a3ba5420f7 /drivers/net | |
parent | 07f02e4625e6d7ca5d4f3835aea9807fe1e0f9c5 (diff) |
[PATCH] ipw2200: add module_param support for antenna selection
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/ipw2200.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index 61cbf2ec0ab4..297dd76177cc 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c | |||
@@ -61,6 +61,7 @@ static int roaming = 1; | |||
61 | static const char ipw_modes[] = { | 61 | static const char ipw_modes[] = { |
62 | 'a', 'b', 'g', '?' | 62 | 'a', 'b', 'g', '?' |
63 | }; | 63 | }; |
64 | static int antenna = CFG_SYS_ANTENNA_BOTH; | ||
64 | 65 | ||
65 | #ifdef CONFIG_IPW_QOS | 66 | #ifdef CONFIG_IPW_QOS |
66 | static int qos_enable = 0; | 67 | static int qos_enable = 0; |
@@ -9627,7 +9628,9 @@ static void init_sys_config(struct ipw_sys_config *sys_config) | |||
9627 | sys_config->disable_unicast_decryption = 1; | 9628 | sys_config->disable_unicast_decryption = 1; |
9628 | sys_config->exclude_multicast_unencrypted = 0; | 9629 | sys_config->exclude_multicast_unencrypted = 0; |
9629 | sys_config->disable_multicast_decryption = 1; | 9630 | sys_config->disable_multicast_decryption = 1; |
9630 | sys_config->antenna_diversity = CFG_SYS_ANTENNA_SLOW_DIV; | 9631 | if (antenna < CFG_SYS_ANTENNA_BOTH || antenna > CFG_SYS_ANTENNA_B) |
9632 | antenna = CFG_SYS_ANTENNA_BOTH; | ||
9633 | sys_config->antenna_diversity = antenna; | ||
9631 | sys_config->pass_crc_to_host = 0; /* TODO: See if 1 gives us FCS */ | 9634 | sys_config->pass_crc_to_host = 0; /* TODO: See if 1 gives us FCS */ |
9632 | sys_config->dot11g_auto_detection = 0; | 9635 | sys_config->dot11g_auto_detection = 0; |
9633 | sys_config->enable_cts_to_self = 0; | 9636 | sys_config->enable_cts_to_self = 0; |
@@ -11258,5 +11261,8 @@ MODULE_PARM_DESC(cmdlog, | |||
11258 | module_param(roaming, int, 0444); | 11261 | module_param(roaming, int, 0444); |
11259 | MODULE_PARM_DESC(roaming, "enable roaming support (default on)"); | 11262 | MODULE_PARM_DESC(roaming, "enable roaming support (default on)"); |
11260 | 11263 | ||
11264 | module_param(antenna, int, 0444); | ||
11265 | MODULE_PARM_DESC(antenna, "select antenna 1=Main, 3=Aux, default 0 [both], 2=slow_diversity (choose the one with lower background noise)"); | ||
11266 | |||
11261 | module_exit(ipw_exit); | 11267 | module_exit(ipw_exit); |
11262 | module_init(ipw_init); | 11268 | module_init(ipw_init); |