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

Commit 108a4bee authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

brcmfmac: extend brcmf_term_iscan() to abort e-scan 



With the introduction of E-Scan there are two scan mechanisms
in the driver. I-Scan was aborted on suspend and bringing down
the device using brcmf_term_iscan(). The function has been
renamed to brcmf_abort_scanning() and covers e-scan abort as
well.

Reviewed-by: default avatarFranky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 029591f3

drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c

+21 −23
Original line number Original line Diff line number Diff line
@@ -2589,11 +2589,13 @@ static s32 brcmf_update_bss_info(struct brcmf_cfg80211_priv *cfg_priv) 
	return err;

	return err;

}

}





static void brcmf_term_iscan(struct brcmf_cfg80211_priv *cfg_priv)

static void brcmf_abort_scanning(struct brcmf_cfg80211_priv *cfg_priv)

{

{

	struct brcmf_cfg80211_iscan_ctrl *iscan = cfg_to_iscan(cfg_priv);

	struct brcmf_cfg80211_iscan_ctrl *iscan = cfg_to_iscan(cfg_priv);

	struct escan_info *escan = &cfg_priv->escan_info;

	struct brcmf_ssid ssid;

	struct brcmf_ssid ssid;





	set_bit(WL_STATUS_SCAN_ABORTING, &cfg_priv->status);

	if (cfg_priv->iscan_on) {

	if (cfg_priv->iscan_on) {

		iscan->state = WL_ISCAN_STATE_IDLE;

		iscan->state = WL_ISCAN_STATE_IDLE;
@@ -2607,8 +2609,21 @@ static void brcmf_term_iscan(struct brcmf_cfg80211_priv *cfg_priv) 
		/* Abort iscan running in FW */

		/* Abort iscan running in FW */

		memset(&ssid, 0, sizeof(ssid));

		memset(&ssid, 0, sizeof(ssid));

		brcmf_run_iscan(iscan, &ssid, WL_SCAN_ACTION_ABORT);

		brcmf_run_iscan(iscan, &ssid, WL_SCAN_ACTION_ABORT);



		if (cfg_priv->scan_request) {

			/* Indidate scan abort to cfg80211 layer */

			WL_INFO("Terminating scan in progress\n");

			cfg80211_scan_done(cfg_priv->scan_request, true);

			cfg_priv->scan_request = NULL;

		}

		}

	}

	}

	if (cfg_priv->escan_on && cfg_priv->scan_request) {

		escan->escan_state = WL_ESCAN_STATE_IDLE;

		brcmf_notify_escan_complete(cfg_priv, escan->ndev, true, true);

	}

	clear_bit(WL_STATUS_SCANNING, &cfg_priv->status);

	clear_bit(WL_STATUS_SCAN_ABORTING, &cfg_priv->status);

}





static void brcmf_notify_iscan_complete(struct brcmf_cfg80211_iscan_ctrl *iscan,

static void brcmf_notify_iscan_complete(struct brcmf_cfg80211_iscan_ctrl *iscan,

					bool aborted)

					bool aborted)
@@ -3032,18 +3047,10 @@ static s32 brcmf_cfg80211_suspend(struct wiphy *wiphy, 
		brcmf_delay(500);

		brcmf_delay(500);

	}

	}





	set_bit(WL_STATUS_SCAN_ABORTING, &cfg_priv->status);

	if (test_bit(WL_STATUS_READY, &cfg_priv->status))

	if (test_bit(WL_STATUS_READY, &cfg_priv->status))

		brcmf_term_iscan(cfg_priv);

		brcmf_abort_scanning(cfg_priv);



	else

	if (cfg_priv->scan_request) {

		/* Indidate scan abort to cfg80211 layer */

		WL_INFO("Terminating scan in progress\n");

		cfg80211_scan_done(cfg_priv->scan_request, true);

		cfg_priv->scan_request = NULL;

	}

		clear_bit(WL_STATUS_SCANNING, &cfg_priv->status);

		clear_bit(WL_STATUS_SCANNING, &cfg_priv->status);

	clear_bit(WL_STATUS_SCAN_ABORTING, &cfg_priv->status);





	/* Turn off watchdog timer */

	/* Turn off watchdog timer */

	if (test_bit(WL_STATUS_READY, &cfg_priv->status))

	if (test_bit(WL_STATUS_READY, &cfg_priv->status))
@@ -3950,7 +3957,7 @@ static void wl_deinit_priv(struct brcmf_cfg80211_priv *cfg_priv) 
	cfg_priv->dongle_up = false;	/* dongle down */

	cfg_priv->dongle_up = false;	/* dongle down */

	brcmf_flush_eq(cfg_priv);

	brcmf_flush_eq(cfg_priv);

	brcmf_link_down(cfg_priv);

	brcmf_link_down(cfg_priv);

	brcmf_term_iscan(cfg_priv);

	brcmf_abort_scanning(cfg_priv);

	brcmf_deinit_priv_mem(cfg_priv);

	brcmf_deinit_priv_mem(cfg_priv);

}

}
@@ -4361,17 +4368,8 @@ static s32 __brcmf_cfg80211_down(struct brcmf_cfg80211_priv *cfg_priv) 
		brcmf_delay(500);

		brcmf_delay(500);

	}

	}





	set_bit(WL_STATUS_SCAN_ABORTING, &cfg_priv->status);

	brcmf_abort_scanning(cfg_priv);

	brcmf_term_iscan(cfg_priv);

	if (cfg_priv->scan_request) {

		cfg80211_scan_done(cfg_priv->scan_request, true);

		/* May need to perform this to cover rmmod */

		/* wl_set_mpc(cfg_to_ndev(wl), 1); */

		cfg_priv->scan_request = NULL;

	}

	clear_bit(WL_STATUS_READY, &cfg_priv->status);

	clear_bit(WL_STATUS_READY, &cfg_priv->status);

	clear_bit(WL_STATUS_SCANNING, &cfg_priv->status);

	clear_bit(WL_STATUS_SCAN_ABORTING, &cfg_priv->status);





	brcmf_debugfs_remove_netdev(cfg_priv);

	brcmf_debugfs_remove_netdev(cfg_priv);