diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/mac80211/util.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 0ad51e14f3c8..7519018ff71a 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c | |||
@@ -1358,9 +1358,9 @@ int ieee80211_reconfig(struct ieee80211_local *local) | |||
1358 | struct ieee80211_chanctx *ctx; | 1358 | struct ieee80211_chanctx *ctx; |
1359 | struct sta_info *sta; | 1359 | struct sta_info *sta; |
1360 | int res, i; | 1360 | int res, i; |
1361 | #ifdef CONFIG_PM | ||
1362 | bool reconfig_due_to_wowlan = false; | 1361 | bool reconfig_due_to_wowlan = false; |
1363 | 1362 | ||
1363 | #ifdef CONFIG_PM | ||
1364 | if (local->suspended) | 1364 | if (local->suspended) |
1365 | local->resuming = true; | 1365 | local->resuming = true; |
1366 | 1366 | ||
@@ -1656,10 +1656,11 @@ int ieee80211_reconfig(struct ieee80211_local *local) | |||
1656 | * If this is for hw restart things are still running. | 1656 | * If this is for hw restart things are still running. |
1657 | * We may want to change that later, however. | 1657 | * We may want to change that later, however. |
1658 | */ | 1658 | */ |
1659 | if (!local->suspended) { | 1659 | if (!local->suspended || reconfig_due_to_wowlan) |
1660 | drv_restart_complete(local); | 1660 | drv_restart_complete(local); |
1661 | |||
1662 | if (!local->suspended) | ||
1661 | return 0; | 1663 | return 0; |
1662 | } | ||
1663 | 1664 | ||
1664 | #ifdef CONFIG_PM | 1665 | #ifdef CONFIG_PM |
1665 | /* first set suspended false, then resuming */ | 1666 | /* first set suspended false, then resuming */ |