brcmfmac: Remove redundant parameter action from scan.

ESCAN is always performed using action start scan. No need to
pass this parameter on to different functions.

Reviewed-by: Arend Van Spriel <arend@broadcom.com>
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index 49dfc00970c3ed6999d9703053d6e95871b13035..53831f50676275c63dd86baa98419184a66d9052 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -946,7 +946,7 @@ static void brcmf_escan_prep(struct brcmf_cfg80211_info *cfg,
 
 static s32
 brcmf_run_escan(struct brcmf_cfg80211_info *cfg, struct brcmf_if *ifp,
-               struct cfg80211_scan_request *request, u16 action)
+               struct cfg80211_scan_request *request)
 {
        s32 params_size = BRCMF_SCAN_PARAMS_FIXED_SIZE +
                          offsetof(struct brcmf_escan_params_le, params_le);
@@ -971,7 +971,7 @@ brcmf_run_escan(struct brcmf_cfg80211_info *cfg, struct brcmf_if *ifp,
        BUG_ON(params_size + sizeof("escan") >= BRCMF_DCMD_MEDLEN);
        brcmf_escan_prep(cfg, &params->params_le, request);
        params->version = cpu_to_le32(BRCMF_ESCAN_REQ_VERSION);
-       params->action = cpu_to_le16(action);
+       params->action = cpu_to_le16(WL_ESCAN_ACTION_START);
        params->sync_id = cpu_to_le16(0x1234);
 
        err = brcmf_fil_iovar_data_set(ifp, "escan", params, params_size);
@@ -1013,7 +1013,7 @@ brcmf_do_escan(struct brcmf_cfg80211_info *cfg, struct wiphy *wiphy,
        results->count = 0;
        results->buflen = WL_ESCAN_RESULTS_FIXED_SIZE;
 
-       err = escan->run(cfg, ifp, request, WL_ESCAN_ACTION_START);
+       err = escan->run(cfg, ifp, request);
        if (err)
                brcmf_scan_config_mpc(ifp, 1);
        return err;

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
index 98c8920be48973941438f1a0a3a4c74ea6fc9694..3b3096b47de932821af283d16ecb4e8fef5d2831 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
@@ -231,7 +231,7 @@ struct escan_info {
        struct wiphy *wiphy;
        struct brcmf_if *ifp;
        s32 (*run)(struct brcmf_cfg80211_info *cfg, struct brcmf_if *ifp,
-                  struct cfg80211_scan_request *request, u16 action);
+                  struct cfg80211_scan_request *request);
 };
 
 /**

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
index a5902c383bac773e659072078d57d11ccfc17fe1..b23dcbcd505e8ddbd039a804969e1129b1fef379 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
@@ -625,11 +625,10 @@ exit:
  * @num_chans: number of channels to scan.
  * @chanspecs: channel parameters for @num_chans channels.
  * @search_state: P2P discover state to use.
- * @action: scan action to pass to firmware.
  * @bss_type: type of P2P bss.
  */
 static s32 brcmf_p2p_escan(struct brcmf_p2p_info *p2p, u32 num_chans,
-                          u16 chanspecs[], s32 search_state, u16 action,
+                          u16 chanspecs[], s32 search_state,
                           enum p2p_bss_type bss_type)
 {
        s32 ret = 0;
@@ -738,7 +737,7 @@ static s32 brcmf_p2p_escan(struct brcmf_p2p_info *p2p, u32 num_chans,
 
        /* set the escan specific parameters */
        p2p_params->eparams.version = cpu_to_le32(BRCMF_ESCAN_REQ_VERSION);
-       p2p_params->eparams.action =  cpu_to_le16(action);
+       p2p_params->eparams.action =  cpu_to_le16(WL_ESCAN_ACTION_START);
        p2p_params->eparams.sync_id = cpu_to_le16(0x1234);
        /* perform p2p scan on primary device */
        ret = brcmf_fil_bsscfg_data_set(vif->ifp, "p2p_scan", memblk, memsize);
@@ -762,8 +761,7 @@ exit:
  */
 static s32 brcmf_p2p_run_escan(struct brcmf_cfg80211_info *cfg,
                               struct brcmf_if *ifp,
-                              struct cfg80211_scan_request *request,
-                              u16 action)
+                              struct cfg80211_scan_request *request)
 {
        struct brcmf_p2p_info *p2p = &cfg->p2p;
        s32 err = 0;
@@ -823,7 +821,7 @@ static s32 brcmf_p2p_run_escan(struct brcmf_cfg80211_info *cfg,
                        num_nodfs++;
                }
                err = brcmf_p2p_escan(p2p, num_nodfs, chanspecs, search_state,
-                                     action, P2PAPI_BSSCFG_DEVICE);
+                                     P2PAPI_BSSCFG_DEVICE);
                kfree(chanspecs);
        }
 exit:
@@ -1092,8 +1090,7 @@ static s32 brcmf_p2p_act_frm_search(struct brcmf_p2p_info *p2p, u16 channel)
                default_chan_list[2] = ch.chspec;
        }
        err = brcmf_p2p_escan(p2p, channel_cnt, default_chan_list,
-                             WL_P2P_DISC_ST_SEARCH, WL_ESCAN_ACTION_START,
-                             P2PAPI_BSSCFG_DEVICE);
+                             WL_P2P_DISC_ST_SEARCH, P2PAPI_BSSCFG_DEVICE);
        kfree(default_chan_list);
 exit:
        return err;