cd7ccb0439c823abf4198c829b52a579b3aa0b7f
[oweals/openwrt.git] / package / kernel / mac80211 / patches / brcm / 114-v5.6-0004-brcmfmac-make-errors-when-setting-roaming-parameters.patch
1 From c12c8913d79c49ceccb38f42714d25b783833758 Mon Sep 17 00:00:00 2001
2 From: Soeren Moch <smoch@web.de>
3 Date: Thu, 12 Dec 2019 00:52:48 +0100
4 Subject: [PATCH 4/7] brcmfmac: make errors when setting roaming parameters
5  non-fatal
6
7 4359 dongles do not support setting roaming parameters (error -52).
8 Do not fail the 80211 configuration in this case.
9
10 Signed-off-by: Soeren Moch <smoch@web.de>
11 Acked-by: Chi-Hsien Lin <chi-hsien.lin@cypress.com>
12 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
13 ---
14  .../wireless/broadcom/brcm80211/brcmfmac/cfg80211.c    | 10 ++++------
15  1 file changed, 4 insertions(+), 6 deletions(-)
16
17 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
18 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
19 @@ -5944,19 +5944,17 @@ static s32 brcmf_dongle_roam(struct brcm
20         roamtrigger[1] = cpu_to_le32(BRCM_BAND_ALL);
21         err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_ROAM_TRIGGER,
22                                      (void *)roamtrigger, sizeof(roamtrigger));
23 -       if (err) {
24 +       if (err)
25                 bphy_err(drvr, "WLC_SET_ROAM_TRIGGER error (%d)\n", err);
26 -               goto roam_setup_done;
27 -       }
28  
29         roam_delta[0] = cpu_to_le32(WL_ROAM_DELTA);
30         roam_delta[1] = cpu_to_le32(BRCM_BAND_ALL);
31         err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_ROAM_DELTA,
32                                      (void *)roam_delta, sizeof(roam_delta));
33 -       if (err) {
34 +       if (err)
35                 bphy_err(drvr, "WLC_SET_ROAM_DELTA error (%d)\n", err);
36 -               goto roam_setup_done;
37 -       }
38 +
39 +       return 0;
40  
41  roam_setup_done:
42         return err;