2019-12-09 22:39:34

by Soeren Moch

Subject: [PATCH 4/8] brcmfmac: make errors when setting roaming parameters non-fatal

4359 dongles do not support setting roaming parameters (error -52).
Do not fail the 80211 configuration in this case.

Signed-off-by: Soeren Moch <[email protected]>
---
Cc: Kalle Valo <[email protected]>
Cc: Arend van Spriel <[email protected]>
Cc: Franky Lin <[email protected]>
Cc: Hante Meuleman <[email protected]>
Cc: Chi-Hsien Lin <[email protected]>
Cc: Wright Feng <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
.../wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index 5598bbd09b62..0cf13cea1dbe 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -6012,19 +6012,17 @@ static s32 brcmf_dongle_roam(struct brcmf_if *ifp)
roamtrigger[1] = cpu_to_le32(BRCM_BAND_ALL);
err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_ROAM_TRIGGER,
(void *)roamtrigger, sizeof(roamtrigger));
- if (err) {
+ if (err)
bphy_err(drvr, "WLC_SET_ROAM_TRIGGER error (%d)\n", err);
- goto roam_setup_done;
- }

roam_delta[0] = cpu_to_le32(WL_ROAM_DELTA);
roam_delta[1] = cpu_to_le32(BRCM_BAND_ALL);
err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_ROAM_DELTA,
(void *)roam_delta, sizeof(roam_delta));
- if (err) {
+ if (err)
bphy_err(drvr, "WLC_SET_ROAM_DELTA error (%d)\n", err);
- goto roam_setup_done;
- }
+
+ return 0;

roam_setup_done:
return err;
--
2.17.1

2019-12-10 03:39:08

by Chi-Hsien Lin

Subject: Re: [PATCH 4/8] brcmfmac: make errors when setting roaming parameters non-fatal

On 12/10/2019 6:38, Soeren Moch wrote:
> 4359 dongles do not support setting roaming parameters (error -52).
> Do not fail the 80211 configuration in this case.
>
> Signed-off-by: Soeren Moch <[email protected]>
Acked-by: Chi-Hsien Lin <[email protected]>

> ---
> Cc: Kalle Valo <[email protected]>
> Cc: Arend van Spriel <[email protected]>
> Cc: Franky Lin <[email protected]>
> Cc: Hante Meuleman <[email protected]>
> Cc: Chi-Hsien Lin <[email protected]>
> Cc: Wright Feng <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> ---
> .../wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
> index 5598bbd09b62..0cf13cea1dbe 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
> @@ -6012,19 +6012,17 @@ static s32 brcmf_dongle_roam(struct brcmf_if *ifp)
> roamtrigger[1] = cpu_to_le32(BRCM_BAND_ALL);
> err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_ROAM_TRIGGER,
> (void *)roamtrigger, sizeof(roamtrigger));
> - if (err) {
> + if (err)
> bphy_err(drvr, "WLC_SET_ROAM_TRIGGER error (%d)\n", err);
> - goto roam_setup_done;
> - }
>
> roam_delta[0] = cpu_to_le32(WL_ROAM_DELTA);
> roam_delta[1] = cpu_to_le32(BRCM_BAND_ALL);
> err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_ROAM_DELTA,
> (void *)roam_delta, sizeof(roam_delta));
> - if (err) {
> + if (err)
> bphy_err(drvr, "WLC_SET_ROAM_DELTA error (%d)\n", err);
> - goto roam_setup_done;
> - }
> +
> + return 0;
>
> roam_setup_done:
> return err;
> --
> 2.17.1
>
> .
>