Commit b743287d authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: cfg80211: fix wiphy delayed work queueing 



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@vger.kernel.org
Reported-by: default avatarJouni Malinen <j@w1.fi>
Fixes: a3ee4dc8 ("wifi: cfg80211: add a work abstraction with special semantics")
Link: https://msgid.link/20240125095108.2feb0eaaa446.I4617f3210ed0e7f252290d5970dac6a876aa595b@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 353d321f

net/wireless/core.c

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * Copyright 2006-2010		Johannes Berg <johannes@sipsolutions.net>

 * Copyright 2013-2014  Intel Mobile Communications GmbH

 * Copyright 2015-2017	Intel Deutschland GmbH

 * Copyright (C) 2018-2023 Intel Corporation

 * Copyright (C) 2018-2024 Intel Corporation

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -1661,6 +1661,7 @@ void wiphy_delayed_work_queue(struct wiphy *wiphy, 
			      unsigned long delay)

{

	if (!delay) {

		del_timer(&dwork->timer);

		wiphy_work_queue(wiphy, &dwork->work);

		return;

	}