This is a note to let you know that I've just added the patch titled
wifi: cfg80211: fix wiphy delayed work queueing
to the 6.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
wifi-cfg80211-fix-wiphy-delayed-work-queueing.patch
and it can be found in the queue-6.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From b743287d7a0007493f5cada34ed2085d475050b4 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Thu, 25 Jan 2024 09:51:09 +0100
Subject: wifi: cfg80211: fix wiphy delayed work queueing
From: Johannes Berg <johannes.berg@xxxxxxxxx>
commit b743287d7a0007493f5cada34ed2085d475050b4 upstream.
When a wiphy work is queued with timer, and then again
without a delay, it's started immediately but *also*
started again after the timer expires. This can lead,
for example, to warnings in mac80211's offchannel code
as reported by Jouni. Running the same work twice isn't
expected, of course. Fix this by deleting the timer at
this point, when queuing immediately due to delay=0.
Cc: stable@xxxxxxxxxxxxxxx
Reported-by: Jouni Malinen <j@xxxxx>
Fixes: a3ee4dc84c4e ("wifi: cfg80211: add a work abstraction with special semantics")
Link: https://msgid.link/20240125095108.2feb0eaaa446.I4617f3210ed0e7f252290d5970dac6a876aa595b@changeid
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/wireless/core.c | 1 +
1 file changed, 1 insertion(+)
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -1675,6 +1675,7 @@ void wiphy_delayed_work_queue(struct wip
unsigned long delay)
{
if (!delay) {
+ del_timer(&dwork->timer);
wiphy_work_queue(wiphy, &dwork->work);
return;
}
Patches currently in stable-queue which might be from johannes.berg@xxxxxxxxx are
queue-6.6/wifi-iwlwifi-uninitialized-variable-in-iwl_acpi_get_.patch
queue-6.6/wifi-iwlwifi-mvm-fix-a-crash-when-we-run-out-of-stations.patch
queue-6.6/wifi-iwlwifi-fix-some-error-codes.patch
queue-6.6/wifi-iwlwifi-fix-double-free-bug.patch
queue-6.6/wifi-cfg80211-fix-wiphy-delayed-work-queueing.patch
queue-6.6/wifi-mac80211-reload-info-pointer-in-ieee80211_tx_dequeue.patch
