diff options
| author |   Xinming Hu <huxm@marvell.com> | 2016-06-16 18:52:23 +0530 |
|---|---|---|
| committer |   Kalle Valo <kvalo@codeaurora.org> | 2016-06-29 18:54:00 +0300 |
| commit | dec277f781cec519d96151bb740963b2a49f5f5d (patch) | |
| tree | d8d8f124de8ec011de292ce35e30b64361e54b38 /drivers/net/wireless/marvell | |
| parent | mwifiex: factor out mwifiex_cancel_scan (diff) | |
| download | linux-dev-dec277f781cec519d96151bb740963b2a49f5f5d.tar.xz linux-dev-dec277f781cec519d96151bb740963b2a49f5f5d.zip | |
mwifiex: cancel pending scan during disconnect
It is obeserved that sometimes scan operation will block the disconnect
during system suspend. It's ok to cancel ongoing scan in this case. It
reduces unnecessary system suspend delay.
Signed-off-by: Xinming Hu <huxm@marvell.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/marvell')
| -rw-r--r-- | drivers/net/wireless/marvell/mwifiex/cfg80211.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c index ff948a922222..a05ae0097843 100644 --- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c +++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c @@ -1672,6 +1672,9 @@ static int mwifiex_cfg80211_change_beacon(struct wiphy *wiphy, struct cfg80211_beacon_data *data) { struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev); + struct mwifiex_adapter *adapter = priv->adapter; + + mwifiex_cancel_scan(adapter); if (GET_BSS_ROLE(priv) != MWIFIEX_BSS_ROLE_UAP) { mwifiex_dbg(priv->adapter, ERROR, |