From: Johannes Berg <johannes.berg@xxxxxxxxx> These comments are no longer correct, it's a wiphy work now so it will go away immediately when canceled. Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@xxxxxxxxx> Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx> --- net/mac80211/cfg.c | 4 ---- net/mac80211/util.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 76c26de5da13..bbb07ba8793b 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -3482,10 +3482,6 @@ static void ieee80211_end_cac(struct wiphy *wiphy, lockdep_assert_wiphy(local->hw.wiphy); list_for_each_entry(sdata, &local->interfaces, list) { - /* it might be waiting for the local->mtx, but then - * by the time it gets it, sdata->wdev.cac_started - * will no longer be true - */ wiphy_delayed_work_cancel(wiphy, &sdata->dfs_cac_timer_work); diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 30d3efedaa8e..9d4e1ab6d843 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -3456,10 +3456,6 @@ void ieee80211_dfs_cac_cancel(struct ieee80211_local *local) lockdep_assert_wiphy(local->hw.wiphy); list_for_each_entry(sdata, &local->interfaces, list) { - /* it might be waiting for the local->mtx, but then - * by the time it gets it, sdata->wdev.cac_started - * will no longer be true - */ wiphy_delayed_work_cancel(local->hw.wiphy, &sdata->dfs_cac_timer_work); -- 2.44.0