aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/ipw2200.c2
-rw-r--r--drivers/net/wireless/ipw2200.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 06909cbc9808..954a095eeb51 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -9600,7 +9600,7 @@ static void init_sys_config(struct ipw_sys_config *sys_config)
9600 sys_config->disable_unicast_decryption = 1; 9600 sys_config->disable_unicast_decryption = 1;
9601 sys_config->exclude_multicast_unencrypted = 0; 9601 sys_config->exclude_multicast_unencrypted = 0;
9602 sys_config->disable_multicast_decryption = 1; 9602 sys_config->disable_multicast_decryption = 1;
9603 sys_config->antenna_diversity = CFG_SYS_ANTENNA_BOTH; 9603 sys_config->antenna_diversity = CFG_SYS_ANTENNA_SLOW_DIV;
9604 sys_config->pass_crc_to_host = 0; /* TODO: See if 1 gives us FCS */ 9604 sys_config->pass_crc_to_host = 0; /* TODO: See if 1 gives us FCS */
9605 sys_config->dot11g_auto_detection = 0; 9605 sys_config->dot11g_auto_detection = 0;
9606 sys_config->enable_cts_to_self = 0; 9606 sys_config->enable_cts_to_self = 0;
diff --git a/drivers/net/wireless/ipw2200.h b/drivers/net/wireless/ipw2200.h
index d9f57f456fb7..e8f133666c65 100644
--- a/drivers/net/wireless/ipw2200.h
+++ b/drivers/net/wireless/ipw2200.h
@@ -1895,6 +1895,7 @@ struct ipw_cmd_log {
1895#define CFG_SYS_ANTENNA_BOTH 0x00 /* NIC selects best antenna */ 1895#define CFG_SYS_ANTENNA_BOTH 0x00 /* NIC selects best antenna */
1896#define CFG_SYS_ANTENNA_A 0x01 /* force antenna A */ 1896#define CFG_SYS_ANTENNA_A 0x01 /* force antenna A */
1897#define CFG_SYS_ANTENNA_B 0x03 /* force antenna B */ 1897#define CFG_SYS_ANTENNA_B 0x03 /* force antenna B */
1898#define CFG_SYS_ANTENNA_SLOW_DIV 0x02 /* consider background noise */
1898 1899
1899/* 1900/*
1900 * The definitions below were lifted off the ipw2100 driver, which only 1901 * The definitions below were lifted off the ipw2100 driver, which only