On Sun, 2011-03-06 at 16:32 +0200, Shahar Levi wrote:
> Set different Cox setting between wl127x and wl128x.
>
> Signed-off-by: Shahar Levi <shahar_levi@xxxxxx>
> ---
> drivers/net/wireless/wl12xx/acx.c | 5 +++++
> drivers/net/wireless/wl12xx/main.c | 6 +++++-
> 2 files changed, 10 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/wireless/wl12xx/acx.c b/drivers/net/wireless/wl12xx/acx.c
> index f0345e6..e970b71 100644
> --- a/drivers/net/wireless/wl12xx/acx.c
> +++ b/drivers/net/wireless/wl12xx/acx.c
> @@ -554,6 +554,11 @@ int wl1271_acx_sg_cfg(struct wl1271 *wl)
> goto out;
> }
>
> + if (wl->chip.id == CHIP_ID_1283_PG20)
> + c->params[CONF_SG_BT_LOAD_RATIO] = 50;
> + else
> + c->params[CONF_SG_BT_LOAD_RATIO] = 200;
> +
You can't change this value in the global array. This needs to be
changed only in the allocated ACX. I'll change it before taking it in.
Also, I think it's cleaner to keep the correct value for wl127x in the
global array (as was before) and only change the value for wl128x here
in this function.
> diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
> index 32d963d..f8e9e3f 100644
> --- a/drivers/net/wireless/wl12xx/main.c
> +++ b/drivers/net/wireless/wl12xx/main.c
> @@ -54,7 +54,11 @@ static struct conf_drv_settings default_conf = {
> [CONF_SG_BT_PER_THRESHOLD] = 7500,
> [CONF_SG_HV3_MAX_OVERRIDE] = 0,
> [CONF_SG_BT_NFS_SAMPLE_INTERVAL] = 400,
> - [CONF_SG_BT_LOAD_RATIO] = 50,
> + /*
> + * CONF_SG_BT_LOAD_RATIO has wl127x or wl128x dependency
> + * (set in wl1271_acx_sg_cfg()
> + */
> + [CONF_SG_BT_LOAD_RATIO] = 0,
> [CONF_SG_AUTO_PS_MODE] = 1,
> [CONF_SG_AUTO_SCAN_PROBE_REQ] = 170,
> [CONF_SG_ACTIVE_SCAN_DURATION_FACTOR_HV3] = 50,
Previously, the value used for wl127x was 50, from the default global
settings. Now you're using 200 for wl127x. This looks suspicious. You
now use 50 (which was the value for wl127x) for wl128x and 200 for
wl127x.
At least the change for wl127x should be done in a separate patch.
--
Cheers,
Luca.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
