2013-06-03 10:34:46

by Kirshenbaum Erez

Subject: [PATCH] Fix channel index in WMI PCP start

Signed-off-by: Kirshenbaum Erez <[email protected]>
---
drivers/net/wireless/ath/wil6210/wmi.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c
index 45b04e3..26f760a 100644
--- a/drivers/net/wireless/ath/wil6210/wmi.c
+++ b/drivers/net/wireless/ath/wil6210/wmi.c
@@ -724,7 +724,7 @@ int wmi_pcp_start(struct wil6210_priv *wil, int bi, u8 wmi_nettype, u8 chan)
.bcon_interval = cpu_to_le16(bi),
.network_type = wmi_nettype,
.disable_sec_offload = 1,
- .channel = chan,
+ .channel = chan-1,
};
struct {
struct wil6210_mbox_hdr_wmi wmi;
@@ -733,9 +733,9 @@ int wmi_pcp_start(struct wil6210_priv *wil, int bi, u8 wmi_nettype, u8 chan)

if (!wil->secure_pcp)
cmd.disable_sec = 1;
-
+ /* This may take some time (FW set/calibrate new freq) */
rc = wmi_call(wil, WMI_PCP_START_CMDID, &cmd, sizeof(cmd),
- WMI_PCP_STARTED_EVENTID, &reply, sizeof(reply), 100);
+ WMI_PCP_STARTED_EVENTID, &reply, sizeof(reply), 5000);
if (rc)
return rc;

--
1.7.11.7

2013-06-03 15:50:51

by Vladimir Kondratiev

Subject: Re: [PATCH] Fix channel index in WMI PCP start

On Monday, June 03, 2013 12:19:13 PM Kirshenbaum Erez wrote:
> Signed-off-by: Kirshenbaum Erez <[email protected]>
> ---
> drivers/net/wireless/ath/wil6210/wmi.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c
> index 45b04e3..26f760a 100644
> --- a/drivers/net/wireless/ath/wil6210/wmi.c
> +++ b/drivers/net/wireless/ath/wil6210/wmi.c
> @@ -724,7 +724,7 @@ int wmi_pcp_start(struct wil6210_priv *wil, int bi, u8 wmi_nettype, u8 chan)
> .bcon_interval = cpu_to_le16(bi),
> .network_type = wmi_nettype,
> .disable_sec_offload = 1,
> - .channel = chan,
> + .channel = chan-1,
> };

Fix for this already merged, see commit
adc2d12 - wil6210: channel off by 1

To make sure you are aligned, please, prior to sending patch,
rebase on 'master' from
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git

> struct {
> struct wil6210_mbox_hdr_wmi wmi;
> @@ -733,9 +733,9 @@ int wmi_pcp_start(struct wil6210_priv *wil, int bi, u8 wmi_nettype, u8 chan)
>
> if (!wil->secure_pcp)
> cmd.disable_sec = 1;
> -
> + /* This may take some time (FW set/calibrate new freq) */
> rc = wmi_call(wil, WMI_PCP_START_CMDID, &cmd, sizeof(cmd),
> - WMI_PCP_STARTED_EVENTID, &reply, sizeof(reply), 100);
> + WMI_PCP_STARTED_EVENTID, &reply, sizeof(reply), 5000);
> if (rc)
> return rc;
This chunk does not belong to this patch, yes?

Thanks, Vladimir

2013-06-03 23:02:20

by Kalle Valo

Subject: Re: [PATCH] Fix channel index in WMI PCP start

Kirshenbaum Erez <[email protected]> writes:

> Signed-off-by: Kirshenbaum Erez <[email protected]>

Please add "wil6210: " prefix to the title.

--
Kalle Valo