Commit 588378f1 authored by Arend Van Spriel's avatar Arend Van Spriel Committed by Kalle Valo
Browse files

brcmfmac: get rid of brcmf_cfg80211_escan() function 



The function brcmf_cfg80211_escan() is only called by brcmf_cfg80211_scan()
so there is no reason to split in two function especially since the latter
does not do an awful lot.

Reviewed-by: default avatarHante Meuleman <hante.meuleman@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
Reviewed-by: default avatarFranky Lin <franky.lin@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent df2d8388

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

+10 −24
Original line number Diff line number Diff line
@@ -1071,13 +1071,16 @@ brcmf_do_escan(struct brcmf_if *ifp, struct cfg80211_scan_request *request) 
}



static s32

brcmf_cfg80211_escan(struct wiphy *wiphy, struct brcmf_cfg80211_vif *vif,

		     struct cfg80211_scan_request *request)

brcmf_cfg80211_scan(struct wiphy *wiphy, struct cfg80211_scan_request *request)

{

	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);

	s32 err;

	struct brcmf_cfg80211_vif *vif;

	s32 err = 0;



	brcmf_dbg(SCAN, "START ESCAN\n");

	brcmf_dbg(TRACE, "Enter\n");

	vif = container_of(request->wdev, struct brcmf_cfg80211_vif, wdev);

	if (!check_vif_up(vif))

		return -EIO;



	if (test_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status)) {

		brcmf_err("Scanning already: status (%lu)\n", cfg->scan_status);
@@ -1102,6 +1105,8 @@ brcmf_cfg80211_escan(struct wiphy *wiphy, struct brcmf_cfg80211_vif *vif, 
	if (vif == cfg->p2p.bss_idx[P2PAPI_BSSCFG_DEVICE].vif)

		vif = cfg->p2p.bss_idx[P2PAPI_BSSCFG_PRIMARY].vif;



	brcmf_dbg(SCAN, "START ESCAN\n");



	cfg->scan_request = request;

	set_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status);
@@ -1121,31 +1126,12 @@ brcmf_cfg80211_escan(struct wiphy *wiphy, struct brcmf_cfg80211_vif *vif, 
	return 0;



scan_out:

	brcmf_err("scan error (%d)\n", err);

	clear_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status);

	cfg->scan_request = NULL;

	return err;

}



static s32

brcmf_cfg80211_scan(struct wiphy *wiphy, struct cfg80211_scan_request *request)

{

	struct brcmf_cfg80211_vif *vif;

	s32 err = 0;



	brcmf_dbg(TRACE, "Enter\n");

	vif = container_of(request->wdev, struct brcmf_cfg80211_vif, wdev);

	if (!check_vif_up(vif))

		return -EIO;



	err = brcmf_cfg80211_escan(wiphy, vif, request);



	if (err)

		brcmf_err("scan error (%d)\n", err);



	brcmf_dbg(TRACE, "Exit\n");

	return err;

}



static s32 brcmf_set_rts(struct net_device *ndev, u32 rts_threshold)

{

	s32 err = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE