43 lines
		
	
	
		
			1.4 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			43 lines
		
	
	
		
			1.4 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
From c12c8913d79c49ceccb38f42714d25b783833758 Mon Sep 17 00:00:00 2001
 | 
						|
From: Soeren Moch <smoch@web.de>
 | 
						|
Date: Thu, 12 Dec 2019 00:52:48 +0100
 | 
						|
Subject: [PATCH 4/7] 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 <smoch@web.de>
 | 
						|
Acked-by: Chi-Hsien Lin <chi-hsien.lin@cypress.com>
 | 
						|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
 | 
						|
---
 | 
						|
 .../wireless/broadcom/brcm80211/brcmfmac/cfg80211.c    | 10 ++++------
 | 
						|
 1 file changed, 4 insertions(+), 6 deletions(-)
 | 
						|
 | 
						|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 | 
						|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 | 
						|
@@ -5936,19 +5936,17 @@ static s32 brcmf_dongle_roam(struct brcm
 | 
						|
 	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;
 |