Commit 331e7894 authored by Arend Van Spriel's avatar Arend Van Spriel Committed by Kalle Valo

brcmfmac: use provided channels for scheduled scan

User-space can provide list of channels in the schedule scan request.
This was ignored so all channels supported and allowed by the device
were used. This patch configures the device to use the channels as
listed in the request.
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 3e48611d
...@@ -131,6 +131,7 @@ ...@@ -131,6 +131,7 @@
#define BRCMF_TXBF_MU_BFR_CAP BIT(1) #define BRCMF_TXBF_MU_BFR_CAP BIT(1)
#define BRCMF_MAXPMKID 16 /* max # PMKID cache entries */ #define BRCMF_MAXPMKID 16 /* max # PMKID cache entries */
#define BRCMF_NUMCHANNELS 64
#define BRCMF_PFN_MACADDR_CFG_VER 1 #define BRCMF_PFN_MACADDR_CFG_VER 1
#define BRCMF_PFN_MAC_OUI_ONLY BIT(0) #define BRCMF_PFN_MAC_OUI_ONLY BIT(0)
...@@ -718,6 +719,21 @@ struct brcmf_pno_param_le { ...@@ -718,6 +719,21 @@ struct brcmf_pno_param_le {
__le32 slow_freq; __le32 slow_freq;
}; };
/**
* struct brcmf_pno_config_le - PNO channel configuration.
*
* @reporttype: determines what is reported.
* @channel_num: number of channels specified in @channel_list.
* @channel_list: channels to use in PNO scan.
* @flags: reserved.
*/
struct brcmf_pno_config_le {
__le32 reporttype;
__le32 channel_num;
__le16 channel_list[BRCMF_NUMCHANNELS];
__le32 flags;
};
/** /**
* struct brcmf_pno_net_param_le - scan parameters per preferred network. * struct brcmf_pno_net_param_le - scan parameters per preferred network.
* *
......
...@@ -18,9 +18,10 @@ ...@@ -18,9 +18,10 @@
#include "core.h" #include "core.h"
#include "debug.h" #include "debug.h"
#include "pno.h"
#include "fwil.h" #include "fwil.h"
#include "fwil_types.h" #include "fwil_types.h"
#include "cfg80211.h"
#include "pno.h"
#define BRCMF_PNO_VERSION 2 #define BRCMF_PNO_VERSION 2
#define BRCMF_PNO_REPEAT 4 #define BRCMF_PNO_REPEAT 4
...@@ -34,6 +35,15 @@ ...@@ -34,6 +35,15 @@
#define BRCMF_PNO_HIDDEN_BIT 2 #define BRCMF_PNO_HIDDEN_BIT 2
#define BRCMF_PNO_SCHED_SCAN_PERIOD 30 #define BRCMF_PNO_SCHED_SCAN_PERIOD 30
static int brcmf_pno_channel_config(struct brcmf_if *ifp,
struct brcmf_pno_config_le *cfg)
{
cfg->reporttype = 0;
cfg->flags = 0;
return brcmf_fil_iovar_data_set(ifp, "pfn_cfg", cfg, sizeof(*cfg));
}
static int brcmf_pno_config(struct brcmf_if *ifp, u32 scan_freq, static int brcmf_pno_config(struct brcmf_if *ifp, u32 scan_freq,
u32 mscan, u32 bestn) u32 mscan, u32 bestn)
{ {
...@@ -167,7 +177,10 @@ int brcmf_pno_clean(struct brcmf_if *ifp) ...@@ -167,7 +177,10 @@ int brcmf_pno_clean(struct brcmf_if *ifp)
int brcmf_pno_start_sched_scan(struct brcmf_if *ifp, int brcmf_pno_start_sched_scan(struct brcmf_if *ifp,
struct cfg80211_sched_scan_request *req) struct cfg80211_sched_scan_request *req)
{ {
struct brcmu_d11inf *d11inf;
struct brcmf_pno_config_le pno_cfg;
struct cfg80211_ssid *ssid; struct cfg80211_ssid *ssid;
u16 chan;
int i, ret; int i, ret;
/* clean up everything */ /* clean up everything */
...@@ -190,6 +203,17 @@ int brcmf_pno_start_sched_scan(struct brcmf_if *ifp, ...@@ -190,6 +203,17 @@ int brcmf_pno_start_sched_scan(struct brcmf_if *ifp,
return ret; return ret;
} }
/* configure channels to use */
d11inf = &ifp->drvr->config->d11inf;
for (i = 0; i < req->n_channels; i++) {
chan = req->channels[i]->hw_value;
pno_cfg.channel_list[i] = cpu_to_le16(chan);
}
if (req->n_channels) {
pno_cfg.channel_num = cpu_to_le32(req->n_channels);
brcmf_pno_channel_config(ifp, &pno_cfg);
}
/* configure each match set */ /* configure each match set */
for (i = 0; i < req->n_match_sets; i++) { for (i = 0; i < req->n_match_sets; i++) {
ssid = &req->match_sets[i].ssid; ssid = &req->match_sets[i].ssid;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment