]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: mac80211: wake the queues in case of failure in resume
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Tue, 19 Nov 2024 15:35:39 +0000 (17:35 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Jan 2025 12:25:04 +0000 (13:25 +0100)
[ Upstream commit 220bf000530f9b1114fa2a1022a871c7ce8a0b38 ]

In case we fail to resume, we'll WARN with
"Hardware became unavailable during restart." and we'll wait until user
space does something. It'll typically bring the interface down and up to
recover. This won't work though because the queues are still stopped on
IEEE80211_QUEUE_STOP_REASON_SUSPEND reason.
Make sure we clear that reason so that we give a chance to the recovery
to succeed.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219447
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20241119173108.cd628f560f97.I76a15fdb92de450e5329940125f3c58916be3942@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/mac80211/util.c

index e49355cbb1ce1260dc1920ee02c12f980d9d567c..0da845d9d486356c71d8d69480981e3a0fc6a88a 100644 (file)
@@ -2351,6 +2351,9 @@ int ieee80211_reconfig(struct ieee80211_local *local)
                        WARN(1, "Hardware became unavailable upon resume. This could be a software issue prior to suspend or a hardware issue.\n");
                else
                        WARN(1, "Hardware became unavailable during restart.\n");
+               ieee80211_wake_queues_by_reason(hw, IEEE80211_MAX_QUEUE_MAP,
+                                               IEEE80211_QUEUE_STOP_REASON_SUSPEND,
+                                               false);
                ieee80211_handle_reconfig_failure(local);
                return res;
        }