diff options
| author | Kalle Valo <kalle.valo@nokia.com> | 2010-02-18 13:25:39 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-02-19 15:52:42 -0500 |
| commit | 243eeb51eaa0a33caeff3e2275b2460eea5579ec (patch) | |
| tree | bf65430f99d0890209772032abd47e7b85e69341 /drivers/net/wireless/wl12xx/wl1271_init.c | |
| parent | 30240fc76a57e37a4bb42976ff7162b5e45e6117 (diff) | |
wl1271: modify wl1271_acx_ac_cfg() to use function parameters
For WMM we need to configure each queue separately so modify
wl1271_acx_ac_cfg() to take the configuration from function parameters
instead.
Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_init.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_init.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_init.c b/drivers/net/wireless/wl12xx/wl1271_init.c index c9848eecb76..2b56a9ecd7f 100644 --- a/drivers/net/wireless/wl12xx/wl1271_init.c +++ b/drivers/net/wireless/wl12xx/wl1271_init.c @@ -195,7 +195,8 @@ static int wl1271_init_beacon_broadcast(struct wl1271 *wl) int wl1271_hw_init(struct wl1271 *wl) { - int ret; + struct conf_tx_ac_category *conf_ac; + int ret, i; ret = wl1271_cmd_general_parms(wl); if (ret < 0) @@ -279,9 +280,14 @@ int wl1271_hw_init(struct wl1271 *wl) goto out_free_memmap; /* Default AC configuration */ - ret = wl1271_acx_ac_cfg(wl); - if (ret < 0) - goto out_free_memmap; + for (i = 0; i < wl->conf.tx.ac_conf_count; i++) { + conf_ac = &wl->conf.tx.ac_conf[i]; + ret = wl1271_acx_ac_cfg(wl, conf_ac->ac, conf_ac->cw_min, + conf_ac->cw_max, conf_ac->aifsn, + conf_ac->tx_op_limit); + if (ret < 0) + goto out_free_memmap; + } /* Configure TX rate classes */ ret = wl1271_acx_rate_policies(wl); |