aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuciano Coelho <luciano.coelho@nokia.com>2009-12-11 08:40:54 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-12-28 16:31:32 -0500
commit3ed8f2c61466f10d99585365fd2aaafaf2d4c949 (patch)
tree5e523946c3861e0006d14964b11595e57d9b2e38
parent8cf5e8e509950237fa0982235a703348d8b6e670 (diff)
wl1271: some new configuration values according to new reference
In the new reference driver, some of the firmware configuration values have been changed. This patch changes them in the wl1271 driver accordingly. Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com> Reviewed-by: Juuso Oikarinen <juuso.oikarinen@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_acx.h4
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_main.c16
2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_acx.h b/drivers/net/wireless/wl12xx/wl1271_acx.h
index fa5d9539440d..dcd64b7919eb 100644
--- a/drivers/net/wireless/wl12xx/wl1271_acx.h
+++ b/drivers/net/wireless/wl12xx/wl1271_acx.h
@@ -885,8 +885,8 @@ struct acx_tx_config_options {
885 __le16 tx_compl_threshold; /* number of packets */ 885 __le16 tx_compl_threshold; /* number of packets */
886} __attribute__ ((packed)); 886} __attribute__ ((packed));
887 887
888#define ACX_RX_MEM_BLOCKS 64 888#define ACX_RX_MEM_BLOCKS 70
889#define ACX_TX_MIN_MEM_BLOCKS 64 889#define ACX_TX_MIN_MEM_BLOCKS 40
890#define ACX_TX_DESCRIPTORS 32 890#define ACX_TX_DESCRIPTORS 32
891#define ACX_NUM_SSID_PROFILES 1 891#define ACX_NUM_SSID_PROFILES 1
892 892
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index b33bdcc1eb4e..fb2221749f7b 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -67,10 +67,10 @@ static struct conf_drv_settings default_conf = {
67 .ps_poll_timeout = 15, 67 .ps_poll_timeout = 15,
68 .upsd_timeout = 15, 68 .upsd_timeout = 15,
69 .rts_threshold = 2347, 69 .rts_threshold = 2347,
70 .rx_cca_threshold = 0xFFEF, 70 .rx_cca_threshold = 0,
71 .irq_blk_threshold = 0, 71 .irq_blk_threshold = 0xFFFF,
72 .irq_pkt_threshold = USHORT_MAX, 72 .irq_pkt_threshold = 0,
73 .irq_timeout = 5, 73 .irq_timeout = 600,
74 .queue_type = CONF_RX_QUEUE_TYPE_LOW_PRIORITY, 74 .queue_type = CONF_RX_QUEUE_TYPE_LOW_PRIORITY,
75 }, 75 },
76 .tx = { 76 .tx = {
@@ -172,8 +172,8 @@ static struct conf_drv_settings default_conf = {
172 } 172 }
173 }, 173 },
174 .frag_threshold = IEEE80211_MAX_FRAG_THRESHOLD, 174 .frag_threshold = IEEE80211_MAX_FRAG_THRESHOLD,
175 .tx_compl_timeout = 5, 175 .tx_compl_timeout = 700,
176 .tx_compl_threshold = 5 176 .tx_compl_threshold = 4
177 }, 177 },
178 .conn = { 178 .conn = {
179 .wake_up_event = CONF_WAKE_UP_EVENT_DTIM, 179 .wake_up_event = CONF_WAKE_UP_EVENT_DTIM,
@@ -186,12 +186,12 @@ static struct conf_drv_settings default_conf = {
186 .rule = CONF_BCN_RULE_PASS_ON_APPEARANCE, 186 .rule = CONF_BCN_RULE_PASS_ON_APPEARANCE,
187 } 187 }
188 }, 188 },
189 .synch_fail_thold = 5, 189 .synch_fail_thold = 10,
190 .bss_lose_timeout = 100, 190 .bss_lose_timeout = 100,
191 .beacon_rx_timeout = 10000, 191 .beacon_rx_timeout = 10000,
192 .broadcast_timeout = 20000, 192 .broadcast_timeout = 20000,
193 .rx_broadcast_in_ps = 1, 193 .rx_broadcast_in_ps = 1,
194 .ps_poll_threshold = 4, 194 .ps_poll_threshold = 20,
195 .sig_trigger_count = 2, 195 .sig_trigger_count = 2,
196 .sig_trigger = { 196 .sig_trigger = {
197 [0] = { 197 [0] = {