diff options
author | Avinash Patil <patila@marvell.com> | 2015-03-23 10:20:55 -0400 |
---|---|---|
committer | Kalle Valo <kvalo@codeaurora.org> | 2015-03-30 04:34:49 -0400 |
commit | 5ff46f7923b87f6cc5d5d66df08c9b6379a0461e (patch) | |
tree | ef2afea8b93b48a8989789c43ef2799e3d3e91df /drivers/net/wireless/mwifiex | |
parent | 2d7defb07bbee286537457e5eab534bac01d126a (diff) |
mwifiex: stop command path in suspend handler
Cancel all pending commands including scan commands and stop CAC
during cfg80211 suspend handler.
Signed-off-by: Avinash Patil <patila@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/mwifiex')
-rw-r--r-- | drivers/net/wireless/mwifiex/cfg80211.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c index fc3bbe77eb18..eab110b1f97b 100644 --- a/drivers/net/wireless/mwifiex/cfg80211.c +++ b/drivers/net/wireless/mwifiex/cfg80211.c | |||
@@ -2942,15 +2942,23 @@ static int mwifiex_cfg80211_suspend(struct wiphy *wiphy, | |||
2942 | { | 2942 | { |
2943 | struct mwifiex_adapter *adapter = mwifiex_cfg80211_get_adapter(wiphy); | 2943 | struct mwifiex_adapter *adapter = mwifiex_cfg80211_get_adapter(wiphy); |
2944 | struct mwifiex_ds_hs_cfg hs_cfg; | 2944 | struct mwifiex_ds_hs_cfg hs_cfg; |
2945 | int ret = 0; | 2945 | int i, ret = 0; |
2946 | struct mwifiex_private *priv = | 2946 | struct mwifiex_private *priv; |
2947 | mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA); | 2947 | |
2948 | for (i = 0; i < adapter->priv_num; i++) { | ||
2949 | priv = adapter->priv[i]; | ||
2950 | mwifiex_abort_cac(priv); | ||
2951 | } | ||
2952 | |||
2953 | mwifiex_cancel_all_pending_cmd(adapter); | ||
2948 | 2954 | ||
2949 | if (!wowlan) { | 2955 | if (!wowlan) { |
2950 | dev_warn(adapter->dev, "None of the WOWLAN triggers enabled\n"); | 2956 | dev_warn(adapter->dev, "None of the WOWLAN triggers enabled\n"); |
2951 | return 0; | 2957 | return 0; |
2952 | } | 2958 | } |
2953 | 2959 | ||
2960 | priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA); | ||
2961 | |||
2954 | if (!priv->media_connected) { | 2962 | if (!priv->media_connected) { |
2955 | dev_warn(adapter->dev, | 2963 | dev_warn(adapter->dev, |
2956 | "Can not configure WOWLAN in disconnected state\n"); | 2964 | "Can not configure WOWLAN in disconnected state\n"); |