Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94ed6ffb authored by Arend Van Spriel's avatar Arend Van Spriel Committed by Kalle Valo
Browse files

brcmfmac: move scheduled scan wiphy param setting to pno module 



As pno module is providing scheduled scan functionality have it taking
care of setting related wiphy parameters as well.

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 9fe929aa

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

+5 −13
Original line number Diff line number Diff line
@@ -6378,16 +6378,6 @@ static int brcmf_setup_ifmodes(struct wiphy *wiphy, struct brcmf_if *ifp) 
	return -ENOMEM;

}



static void brcmf_wiphy_pno_params(struct wiphy *wiphy)

{

	/* scheduled scan settings */

	wiphy->max_sched_scan_reqs = 1;

	wiphy->max_sched_scan_ssids = BRCMF_PNO_MAX_PFN_COUNT;

	wiphy->max_match_sets = BRCMF_PNO_MAX_PFN_COUNT;

	wiphy->max_sched_scan_ie_len = BRCMF_SCAN_IE_LEN_MAX;

	wiphy->max_sched_scan_plan_interval = BRCMF_PNO_SCHED_SCAN_MAX_PERIOD;

}



#ifdef CONFIG_PM

static const struct wiphy_wowlan_support brcmf_wowlan_support = {

	.flags = WIPHY_WOWLAN_MAGIC_PKT | WIPHY_WOWLAN_DISCONNECT,
@@ -6434,6 +6424,7 @@ static int brcmf_setup_wiphy(struct wiphy *wiphy, struct brcmf_if *ifp) 
	const struct ieee80211_iface_combination *combo;

	struct ieee80211_supported_band *band;

	u16 max_interfaces = 0;

	bool gscan;

	__le32 bandlist[3];

	u32 n_bands;

	int err, i;
@@ -6483,9 +6474,10 @@ static int brcmf_setup_wiphy(struct wiphy *wiphy, struct brcmf_if *ifp) 
		wiphy->flags |= WIPHY_FLAG_SUPPORTS_FW_ROAM;

	wiphy->mgmt_stypes = brcmf_txrx_stypes;

	wiphy->max_remain_on_channel_duration = 5000;

	if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_PNO))

		brcmf_wiphy_pno_params(wiphy);



	if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_PNO)) {

		gscan = brcmf_feat_is_enabled(ifp, BRCMF_FEAT_GSCAN);

		brcmf_pno_wiphy_params(wiphy, gscan);

	}

	/* vendor commands/events support */

	wiphy->vendor_commands = brcmf_vendor_cmds;

	wiphy->n_vendor_commands = BRCMF_VNDR_CMDS_LAST - 1;

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

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
#include "fwil_types.h"

#include "p2p.h"



#define BRCMF_SCAN_IE_LEN_MAX		2048



#define WL_NUM_SCAN_MAX			10

#define WL_TLV_INFO_MAX			1024

#define WL_BSS_INFO_MAX			2048

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

+10 −0
Original line number Diff line number Diff line
@@ -239,3 +239,13 @@ int brcmf_pno_start_sched_scan(struct brcmf_if *ifp, 
	return ret;

}



void brcmf_pno_wiphy_params(struct wiphy *wiphy, bool gscan)

{

	/* scheduled scan settings */

	wiphy->max_sched_scan_reqs = gscan ? 2 : 1;

	wiphy->max_sched_scan_ssids = BRCMF_PNO_MAX_PFN_COUNT;

	wiphy->max_match_sets = BRCMF_PNO_MAX_PFN_COUNT;

	wiphy->max_sched_scan_ie_len = BRCMF_SCAN_IE_LEN_MAX;

	wiphy->max_sched_scan_plan_interval = BRCMF_PNO_SCHED_SCAN_MAX_PERIOD;

}

drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.h

+8 −0
Original line number Diff line number Diff line
@@ -37,4 +37,12 @@ int brcmf_pno_clean(struct brcmf_if *ifp); 
int brcmf_pno_start_sched_scan(struct brcmf_if *ifp,

			       struct cfg80211_sched_scan_request *req);



/**

 * brcmf_pno_wiphy_params - fill scheduled scan parameters in wiphy instance.

 *

 * @wiphy: wiphy instance to be used.

 * @gscan: indicates whether the device has support for g-scan feature.

 */

void brcmf_pno_wiphy_params(struct wiphy *wiphy, bool gscan);



#endif /* _BRCMF_PNO_H */