]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
mwifiex: avoid querying wakeup reason when wowlan is disabled
authorAmitkumar Karwar <akarwar@marvell.com>
Thu, 21 Apr 2016 15:07:56 +0000 (08:07 -0700)
committerKalle Valo <kvalo@codeaurora.org>
Wed, 27 Apr 2016 13:52:00 +0000 (16:52 +0300)
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>
drivers/net/wireless/marvell/mwifiex/cfg80211.c

index 734cf67b79c1863ac53d53ace9612a4a59dfbfab..ff948a9222225dee00b4b46ee0dec095e71726c0 100644 (file)
@@ -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]);