diff options
author | Arik Nemtsov <arik@wizery.com> | 2010-10-16 11:44:51 -0400 |
---|---|---|
committer | Luciano Coelho <coelho@ti.com> | 2011-01-24 15:11:46 -0500 |
commit | 1e05a81888318752e9a6d2158a95ddd6442ae117 (patch) | |
tree | 1ff3513c0a5f037746f7e5334a3eeb7f64bd661c /drivers/net/wireless/wl12xx/main.c | |
parent | 6177eaea277527e48753d050723cd138494c98a8 (diff) |
wl12xx: Add AP related configuration to conf_drv_settings
Rate class configuration has been split up for AP and STA modes.
Template related configuration likewise separated.
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Reviewed-by: Luciano Coelho <coelho@ti.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/main.c')
-rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 45 |
1 files changed, 43 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index 062247ef3ad2..788959a5f0de 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c | |||
@@ -116,11 +116,11 @@ static struct conf_drv_settings default_conf = { | |||
116 | }, | 116 | }, |
117 | .tx = { | 117 | .tx = { |
118 | .tx_energy_detection = 0, | 118 | .tx_energy_detection = 0, |
119 | .rc_conf = { | 119 | .sta_rc_conf = { |
120 | .enabled_rates = 0, | 120 | .enabled_rates = 0, |
121 | .short_retry_limit = 10, | 121 | .short_retry_limit = 10, |
122 | .long_retry_limit = 10, | 122 | .long_retry_limit = 10, |
123 | .aflags = 0 | 123 | .aflags = 0, |
124 | }, | 124 | }, |
125 | .ac_conf_count = 4, | 125 | .ac_conf_count = 4, |
126 | .ac_conf = { | 126 | .ac_conf = { |
@@ -153,6 +153,45 @@ static struct conf_drv_settings default_conf = { | |||
153 | .tx_op_limit = 1504, | 153 | .tx_op_limit = 1504, |
154 | }, | 154 | }, |
155 | }, | 155 | }, |
156 | .ap_rc_conf = { | ||
157 | [0] = { | ||
158 | .enabled_rates = CONF_TX_AP_ENABLED_RATES, | ||
159 | .short_retry_limit = 10, | ||
160 | .long_retry_limit = 10, | ||
161 | .aflags = 0, | ||
162 | }, | ||
163 | [1] = { | ||
164 | .enabled_rates = CONF_TX_AP_ENABLED_RATES, | ||
165 | .short_retry_limit = 10, | ||
166 | .long_retry_limit = 10, | ||
167 | .aflags = 0, | ||
168 | }, | ||
169 | [2] = { | ||
170 | .enabled_rates = CONF_TX_AP_ENABLED_RATES, | ||
171 | .short_retry_limit = 10, | ||
172 | .long_retry_limit = 10, | ||
173 | .aflags = 0, | ||
174 | }, | ||
175 | [3] = { | ||
176 | .enabled_rates = CONF_TX_AP_ENABLED_RATES, | ||
177 | .short_retry_limit = 10, | ||
178 | .long_retry_limit = 10, | ||
179 | .aflags = 0, | ||
180 | }, | ||
181 | }, | ||
182 | .ap_mgmt_conf = { | ||
183 | .enabled_rates = CONF_TX_AP_DEFAULT_MGMT_RATES, | ||
184 | .short_retry_limit = 10, | ||
185 | .long_retry_limit = 10, | ||
186 | .aflags = 0, | ||
187 | }, | ||
188 | .ap_bcst_conf = { | ||
189 | .enabled_rates = CONF_HW_BIT_RATE_1MBPS, | ||
190 | .short_retry_limit = 10, | ||
191 | .long_retry_limit = 10, | ||
192 | .aflags = 0, | ||
193 | }, | ||
194 | |||
156 | .tid_conf_count = 4, | 195 | .tid_conf_count = 4, |
157 | .tid_conf = { | 196 | .tid_conf = { |
158 | [CONF_TX_AC_BE] = { | 197 | [CONF_TX_AC_BE] = { |
@@ -193,6 +232,8 @@ static struct conf_drv_settings default_conf = { | |||
193 | .tx_compl_threshold = 4, | 232 | .tx_compl_threshold = 4, |
194 | .basic_rate = CONF_HW_BIT_RATE_1MBPS, | 233 | .basic_rate = CONF_HW_BIT_RATE_1MBPS, |
195 | .basic_rate_5 = CONF_HW_BIT_RATE_6MBPS, | 234 | .basic_rate_5 = CONF_HW_BIT_RATE_6MBPS, |
235 | .tmpl_short_retry_limit = 10, | ||
236 | .tmpl_long_retry_limit = 10, | ||
196 | }, | 237 | }, |
197 | .conn = { | 238 | .conn = { |
198 | .wake_up_event = CONF_WAKE_UP_EVENT_DTIM, | 239 | .wake_up_event = CONF_WAKE_UP_EVENT_DTIM, |