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

Commit 3a3ecf1d authored by Arend Van Spriel's avatar Arend Van Spriel Committed by Johannes Berg
Browse files

cfg80211: add request id parameter to .sched_scan_stop() signature 



For multiple scheduled scan support the driver needs to know which
scheduled scan request is being stopped. Pass the request id in the
.sched_scan_stop() callback.

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 avatarJohannes Berg <johannes.berg@intel.com>
parent 3007e352

drivers/net/wireless/ath/ath6kl/cfg80211.c

+1 −1
Original line number Diff line number Diff line
@@ -3352,7 +3352,7 @@ static int ath6kl_cfg80211_sscan_start(struct wiphy *wiphy, 
}



static int ath6kl_cfg80211_sscan_stop(struct wiphy *wiphy,

				      struct net_device *dev)

				      struct net_device *dev, u64 reqid)

{

	struct ath6kl_vif *vif = netdev_priv(dev);

	bool stopped;

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

+3 −3
Original line number Diff line number Diff line
@@ -3405,7 +3405,7 @@ brcmf_cfg80211_sched_scan_start(struct wiphy *wiphy, 
}



static int brcmf_cfg80211_sched_scan_stop(struct wiphy *wiphy,

					  struct net_device *ndev)

					  struct net_device *ndev, u64 reqid)

{

	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);

	struct brcmf_if *ifp = netdev_priv(ndev);
@@ -3607,7 +3607,7 @@ static s32 brcmf_cfg80211_resume(struct wiphy *wiphy) 
				      cfg->wowl.pre_pmmode);

		cfg->wowl.active = false;

		if (cfg->wowl.nd_enabled) {

			brcmf_cfg80211_sched_scan_stop(cfg->wiphy, ifp->ndev);

			brcmf_cfg80211_sched_scan_stop(cfg->wiphy, ifp->ndev, 0);

			brcmf_fweh_unregister(cfg->pub, BRCMF_E_PFN_NET_FOUND);

			brcmf_fweh_register(cfg->pub, BRCMF_E_PFN_NET_FOUND,

					    brcmf_notify_sched_scan_results);
@@ -3691,7 +3691,7 @@ static s32 brcmf_cfg80211_suspend(struct wiphy *wiphy, 


	/* Stop scheduled scan */

	if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_PNO))

		brcmf_cfg80211_sched_scan_stop(wiphy, ndev);

		brcmf_cfg80211_sched_scan_stop(wiphy, ndev, 0);



	/* end any scanning */

	if (test_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status))

drivers/net/wireless/marvell/mwifiex/cfg80211.c

+1 −1
Original line number Diff line number Diff line
@@ -2720,7 +2720,7 @@ mwifiex_cfg80211_sched_scan_start(struct wiphy *wiphy, 
 * previous bgscan configuration in the firmware

 */

static int mwifiex_cfg80211_sched_scan_stop(struct wiphy *wiphy,

					    struct net_device *dev)

					    struct net_device *dev, u64 reqid)

{

	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);

include/net/cfg80211.h

+8 −7
Original line number Diff line number Diff line
@@ -2773,12 +2773,12 @@ struct cfg80211_nan_func { 
 * @set_cqm_txe_config: Configure connection quality monitor TX error

 *	thresholds.

 * @sched_scan_start: Tell the driver to start a scheduled scan.

 * @sched_scan_stop: Tell the driver to stop an ongoing scheduled scan. This

 *	call must stop the scheduled scan and be ready for starting a new one

 *	before it returns, i.e. @sched_scan_start may be called immediately

 *	after that again and should not fail in that case. The driver should

 *	not call cfg80211_sched_scan_stopped() for a requested stop (when this

 *	method returns 0.)

 * @sched_scan_stop: Tell the driver to stop an ongoing scheduled scan with

 *	given request id. This call must stop the scheduled scan and be ready

 *	for starting a new one before it returns, i.e. @sched_scan_start may be

 *	called immediately after that again and should not fail in that case.

 *	The driver should not call cfg80211_sched_scan_stopped() for a requested

 *	stop (when this method returns 0).

 *

 * @mgmt_frame_register: Notify driver that a management frame type was

 *	registered. The callback is allowed to sleep.
@@ -3076,7 +3076,8 @@ struct cfg80211_ops { 
	int	(*sched_scan_start)(struct wiphy *wiphy,

				struct net_device *dev,

				struct cfg80211_sched_scan_request *request);

	int	(*sched_scan_stop)(struct wiphy *wiphy, struct net_device *dev);

	int	(*sched_scan_stop)(struct wiphy *wiphy, struct net_device *dev,

				   u64 reqid);



	int	(*set_rekey_data)(struct wiphy *wiphy, struct net_device *dev,

				  struct cfg80211_gtk_rekey_data *data);

net/mac80211/cfg.c

+2 −1
Original line number Diff line number Diff line
@@ -2242,7 +2242,8 @@ ieee80211_sched_scan_start(struct wiphy *wiphy, 
}



static int

ieee80211_sched_scan_stop(struct wiphy *wiphy, struct net_device *dev)

ieee80211_sched_scan_stop(struct wiphy *wiphy, struct net_device *dev,

			  u64 reqid)

{

	struct ieee80211_local *local = wiphy_priv(wiphy);