summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
diff options
context:
space:
mode:
authorchunfan chen <jeffc@marvell.com>2016-01-13 01:26:54 -0800
committerKalle Valo <kvalo@codeaurora.org>2016-01-29 11:20:39 +0200
commit7d7f07d8c5d35ebfb207650b0dbcf437dad76bab (patch)
tree6f7e38282bf1259c48931dde967cb557537fb14f /drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
parent5323b53d80fc17604b2c60b725af116827330b2c (diff)
mwifiex: add wowlan net-detect support
This patch adds support for wakeup when configured network is detected. Signed-off-by: chunfan chen <jeffc@marvell.com> Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> Signed-off-by: Xinming Hu <huxm@marvell.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/marvell/mwifiex/sta_ioctl.c')
-rw-r--r--drivers/net/wireless/marvell/mwifiex/sta_ioctl.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
index 2cc1a32691bd..7277c24ee9aa 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
@@ -505,10 +505,17 @@ int mwifiex_enable_hs(struct mwifiex_adapter *adapter)
}
priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA);
+
if (priv && priv->sched_scanning) {
- dev_dbg(adapter->dev, "aborting bgscan!\n");
- mwifiex_stop_bg_scan(priv);
- cfg80211_sched_scan_stopped(priv->wdev.wiphy);
+#ifdef CONFIG_PM
+ if (!priv->wdev.wiphy->wowlan_config->nd_config) {
+#endif
+ mwifiex_dbg(adapter, CMD, "aborting bgscan!\n");
+ mwifiex_stop_bg_scan(priv);
+ cfg80211_sched_scan_stopped(priv->wdev.wiphy);
+#ifdef CONFIG_PM
+ }
+#endif
}
if (adapter->hs_activated) {