1 From ab5981c830339b945ddbedc314567a9e5f506d72 Mon Sep 17 00:00:00 2001
2 From: Arend Van Spriel <arend.vanspriel@broadcom.com>
3 Date: Wed, 23 Nov 2016 10:25:24 +0000
4 Subject: [PATCH] brcmfmac: change prototype for brcmf_do_escan()
6 Reduce the number of parameters as the removed ones can be obtained
7 through struct brcmf_if parameter.
9 Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
10 Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
11 Reviewed-by: Franky Lin <franky.lin@broadcom.com>
12 Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
13 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
15 drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 10 +++++-----
16 1 file changed, 5 insertions(+), 5 deletions(-)
18 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
19 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
20 @@ -1080,9 +1080,9 @@ exit:
24 -brcmf_do_escan(struct brcmf_cfg80211_info *cfg, struct wiphy *wiphy,
25 - struct brcmf_if *ifp, struct cfg80211_scan_request *request)
26 +brcmf_do_escan(struct brcmf_if *ifp, struct cfg80211_scan_request *request)
28 + struct brcmf_cfg80211_info *cfg = ifp->drvr->config;
31 struct brcmf_scan_results *results;
32 @@ -1090,7 +1090,7 @@ brcmf_do_escan(struct brcmf_cfg80211_inf
34 brcmf_dbg(SCAN, "Enter\n");
36 - escan->wiphy = wiphy;
37 + escan->wiphy = cfg->wiphy;
38 escan->escan_state = WL_ESCAN_STATE_SCANNING;
39 passive_scan = cfg->active_scan ? 0 : 1;
40 err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_PASSIVE_SCAN,
41 @@ -1170,7 +1170,7 @@ brcmf_cfg80211_escan(struct wiphy *wiphy
45 - err = brcmf_do_escan(cfg, wiphy, vif->ifp, request);
46 + err = brcmf_do_escan(vif->ifp, request);
50 @@ -3289,7 +3289,7 @@ brcmf_notify_sched_scan_results(struct b
52 set_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status);
53 cfg->escan_info.run = brcmf_run_escan;
54 - err = brcmf_do_escan(cfg, wiphy, ifp, request);
55 + err = brcmf_do_escan(ifp, request);
57 clear_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status);