diff options
| author | Amitkumar Karwar <akarwar@marvell.com> | 2016-04-21 08:07:56 -0700 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2016-04-27 16:52:00 +0300 |
| commit | d286af9bf40ab88f2035aef293f6ecae4187c6bb (patch) | |
| tree | a72e5fded008f9ce479f12ac1f68af07d98f8311 | |
| parent | df2288623ee0ce77743d76ed8ca816e92246e77b (diff) | |
| download | linux-d286af9bf40ab88f2035aef293f6ecae4187c6bb.tar.gz linux-d286af9bf40ab88f2035aef293f6ecae4187c6bb.tar.bz2 linux-d286af9bf40ab88f2035aef293f6ecae4187c6bb.zip | |
mwifiex: avoid querying wakeup reason when wowlan is disabled
In cfg80211 resume handler, we query wakeup reason from firmware and
report to cfg80211. if wowlan is disabled, connection is already
terminated during suspend. We don't need to query wakeup reason in this
case.
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
| -rw-r--r-- | drivers/net/wireless/marvell/mwifiex/cfg80211.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c index 734cf67b79c1..ff948a922222 100644 --- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c +++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c @@ -3355,6 +3355,9 @@ static int mwifiex_cfg80211_resume(struct wiphy *wiphy) } } + if (!wiphy->wowlan_config) + goto done; + priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA); mwifiex_get_wakeup_reason(priv, HostCmd_ACT_GEN_GET, MWIFIEX_SYNC_CMD, &wakeup_reason); @@ -3400,6 +3403,7 @@ static int mwifiex_cfg80211_resume(struct wiphy *wiphy) cfg80211_report_wowlan_wakeup(&priv->wdev, &wakeup_report, GFP_KERNEL); +done: if (adapter->nd_info) { for (i = 0 ; i < adapter->nd_info->n_matches ; i++) kfree(adapter->nd_info->matches[i]); |