mwifiex: abort cac in del_station() handler

When hostapd is killed with Ctrl+C before cac get completed,
stop_ap handler will not be called, thus priv->wdev.cac_started
flag remains set.
Hostapd restart attempt will be failed in this case with device
busy error. This patch aborts cac in del_station handler to
handle this corner case.

Signed-off-by: Xinming Hu <huxm@marvell.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
index 0aab9354ab5b5a6573501c0a0c733c70c9a5f36b..f7c26d6bca28f6aa64bed9d8ef589e35f6db5c2a 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
@@ -1708,6 +1708,11 @@ mwifiex_cfg80211_del_station(struct wiphy *wiphy, struct net_device *dev,
        u8 deauth_mac[ETH_ALEN];
        unsigned long flags;
 
+       if (!priv->bss_started && priv->wdev.cac_started) {
+               mwifiex_dbg(priv->adapter, INFO, "%s: abort CAC!\n", __func__);
+               mwifiex_abort_cac(priv);
+       }
+
        if (list_empty(&priv->sta_list) || !priv->bss_started)
                return 0;