From: Arend van Spriel <arend.vanspriel@broadcom.com>
To: Kalle Valo <kvalo@codeaurora.org>
Cc: linux-wireless <linux-wireless@vger.kernel.org>,
Arend van Spriel <arend.vanspriel@broadcom.com>
Subject: [PATCH 05/12] brcmfmac: change prototype for brcmf_do_escan()
Date: Wed, 23 Nov 2016 10:25:24 +0000 [thread overview]
Message-ID: <1479896731-5091-6-git-send-email-arend.vanspriel@broadcom.com> (raw)
In-Reply-To: <1479896731-5091-1-git-send-email-arend.vanspriel@broadcom.com>
Reduce the number of parameters as the removed ones can be obtained
through struct brcmf_if parameter.
Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
Reviewed-by: Franky Lin <franky.lin@broadcom.com>
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
---
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index 096e214..70eca76 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -1080,9 +1080,9 @@ static void brcmf_escan_prep(struct brcmf_cfg80211_info *cfg,
}
static s32
-brcmf_do_escan(struct brcmf_cfg80211_info *cfg, struct wiphy *wiphy,
- struct brcmf_if *ifp, struct cfg80211_scan_request *request)
+brcmf_do_escan(struct brcmf_if *ifp, struct cfg80211_scan_request *request)
{
+ struct brcmf_cfg80211_info *cfg = ifp->drvr->config;
s32 err;
u32 passive_scan;
struct brcmf_scan_results *results;
@@ -1090,7 +1090,7 @@ static void brcmf_escan_prep(struct brcmf_cfg80211_info *cfg,
brcmf_dbg(SCAN, "Enter\n");
escan->ifp = ifp;
- escan->wiphy = wiphy;
+ escan->wiphy = cfg->wiphy;
escan->escan_state = WL_ESCAN_STATE_SCANNING;
passive_scan = cfg->active_scan ? 0 : 1;
err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_PASSIVE_SCAN,
@@ -1170,7 +1170,7 @@ static void brcmf_escan_prep(struct brcmf_cfg80211_info *cfg,
if (err)
goto scan_out;
- err = brcmf_do_escan(cfg, wiphy, vif->ifp, request);
+ err = brcmf_do_escan(vif->ifp, request);
if (err)
goto scan_out;
} else {
@@ -3289,7 +3289,7 @@ static void brcmf_init_escan(struct brcmf_cfg80211_info *cfg)
set_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status);
cfg->escan_info.run = brcmf_run_escan;
- err = brcmf_do_escan(cfg, wiphy, ifp, request);
+ err = brcmf_do_escan(ifp, request);
if (err) {
clear_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status);
goto out_err;
--
1.9.1
next prev parent reply other threads:[~2016-11-23 10:27 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-23 10:25 [PATCH 00/12] brcmfmac: scheduled scan cleanup and chip support Arend van Spriel
2016-11-23 10:25 ` [PATCH 01/12] brcmfmac: add pcie host dongle interface rev6 support Arend van Spriel
2016-11-29 15:30 ` [01/12] " Kalle Valo
2016-11-23 10:25 ` [PATCH 02/12] brcmfmac: add support for 43341 chip Arend van Spriel
2016-11-23 10:25 ` [PATCH 03/12] brcmfmac: move pno helper functions in separate source file Arend van Spriel
2016-11-29 7:08 ` Rafał Miłecki
2016-11-29 7:57 ` Johannes Berg
2016-11-29 9:23 ` Arend Van Spriel
2016-11-29 12:29 ` Rafał Miłecki
2016-11-29 14:54 ` Kalle Valo
2016-11-23 10:25 ` [PATCH 04/12] brcmfmac: fix handling ssids in .sched_scan_start() callback Arend van Spriel
2016-11-23 10:25 ` Arend van Spriel [this message]
2016-11-23 10:25 ` [PATCH 06/12] brcmfmac: make internal escan more generic Arend van Spriel
2016-11-23 10:25 ` [PATCH 07/12] brcmfmac: split up brcmf_pno_config() function Arend van Spriel
2016-11-23 10:25 ` [PATCH 08/12] brcmfmac: move scheduled scan activation to pno source file Arend van Spriel
2016-11-23 10:25 ` [PATCH 09/12] brcmfmac: use provided channels for scheduled scan Arend van Spriel
2016-11-23 10:25 ` [PATCH 10/12] brcmfmac: remove restriction from .sched_scan_start() callback Arend van Spriel
2016-11-23 10:25 ` [PATCH 11/12] brcmfmac: use requested scan interval in scheduled scan Arend van Spriel
2016-11-23 10:25 ` [PATCH 12/12] brcmfmac: fix scheduled scan result handling for newer chips Arend van Spriel
2016-11-29 7:37 ` [PATCH 00/12] brcmfmac: scheduled scan cleanup and chip support Rafał Miłecki
2016-11-29 9:58 ` Arend Van Spriel
2016-11-29 12:30 ` Rafał Miłecki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1479896731-5091-6-git-send-email-arend.vanspriel@broadcom.com \
--to=arend.vanspriel@broadcom.com \
--cc=kvalo@codeaurora.org \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).