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

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

cfg80211: add request id to cfg80211_sched_scan_*() api 



Have proper request id filled in the SCHED_SCAN_RESULTS and
SCHED_SCAN_STOPPED notifications toward user-space by having the
driver provide it through the api.

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 e38a017b

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

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static void ath6kl_cfg80211_sscan_disable(struct ath6kl_vif *vif) 
	if (!stopped)

		return;



	cfg80211_sched_scan_stopped(ar->wiphy);

	cfg80211_sched_scan_stopped(ar->wiphy, 0);

}



static int ath6kl_set_wpa_version(struct ath6kl_vif *vif,

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

+1 −1
Original line number Diff line number Diff line
@@ -1082,7 +1082,7 @@ void ath6kl_wmi_sscan_timer(unsigned long ptr) 
{

	struct ath6kl_vif *vif = (struct ath6kl_vif *) ptr;



	cfg80211_sched_scan_results(vif->ar->wiphy);

	cfg80211_sched_scan_results(vif->ar->wiphy, 0);

}



static int ath6kl_wmi_bssinfo_event_rx(struct wmi *wmi, u8 *datap, int len,

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

+2 −2
Original line number Diff line number Diff line
@@ -762,7 +762,7 @@ s32 brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg, 
		brcmf_dbg(SCAN, "scheduled scan completed\n");

		cfg->internal_escan = false;

		if (!aborted)

			cfg80211_sched_scan_results(cfg_to_wiphy(cfg));

			cfg80211_sched_scan_results(cfg_to_wiphy(cfg), 0);

	} else if (scan_request) {

		struct cfg80211_scan_info info = {

			.aborted = aborted,
@@ -3372,7 +3372,7 @@ brcmf_notify_sched_scan_results(struct brcmf_if *ifp, 
		goto free_req;



out_err:

	cfg80211_sched_scan_stopped(wiphy);

	cfg80211_sched_scan_stopped(wiphy, 0);

free_req:

	kfree(request);

	return err;

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

+3 −3
Original line number Diff line number Diff line
@@ -2053,7 +2053,7 @@ mwifiex_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev, 
	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);



	if (!mwifiex_stop_bg_scan(priv))

		cfg80211_sched_scan_stopped_rtnl(priv->wdev.wiphy);

		cfg80211_sched_scan_stopped_rtnl(priv->wdev.wiphy, 0);



	if (mwifiex_deauthenticate(priv, NULL))

		return -EFAULT;
@@ -2321,7 +2321,7 @@ mwifiex_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, 
		    (int)sme->ssid_len, (char *)sme->ssid, sme->bssid);



	if (!mwifiex_stop_bg_scan(priv))

		cfg80211_sched_scan_stopped_rtnl(priv->wdev.wiphy);

		cfg80211_sched_scan_stopped_rtnl(priv->wdev.wiphy, 0);



	ret = mwifiex_cfg80211_assoc(priv, sme->ssid_len, sme->ssid, sme->bssid,

				     priv->bss_mode, sme->channel, sme, 0);
@@ -2530,7 +2530,7 @@ mwifiex_cfg80211_scan(struct wiphy *wiphy, 
		priv->scan_block = false;



	if (!mwifiex_stop_bg_scan(priv))

		cfg80211_sched_scan_stopped_rtnl(priv->wdev.wiphy);

		cfg80211_sched_scan_stopped_rtnl(priv->wdev.wiphy, 0);



	user_scan_cfg = kzalloc(sizeof(*user_scan_cfg), GFP_KERNEL);

	if (!user_scan_cfg)

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

+1 −1
Original line number Diff line number Diff line
@@ -748,7 +748,7 @@ mwifiex_close(struct net_device *dev) 
		mwifiex_dbg(priv->adapter, INFO,

			    "aborting bgscan on ndo_stop\n");

		mwifiex_stop_bg_scan(priv);

		cfg80211_sched_scan_stopped(priv->wdev.wiphy);

		cfg80211_sched_scan_stopped(priv->wdev.wiphy, 0);

	}



	return 0;