On Tue, 2023-06-06 at 14:49 +0200, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@xxxxxxxxx>
>
> This work can now trivially be converted, it behaves
> identical either way.
>
> Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
> ---
> net/wireless/core.c | 6 +++---
> net/wireless/core.h | 2 +-
> net/wireless/nl80211.c | 3 ++-
> 3 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/net/wireless/core.c b/net/wireless/core.c
> index 3b37bbc4e8d2..56b7d4404eed 100644
> --- a/net/wireless/core.c
> +++ b/net/wireless/core.c
> @@ -365,7 +365,8 @@ static void cfg80211_destroy_iface_wk(struct work_struct *work)
> rtnl_unlock();
> }
>
> -static void cfg80211_sched_scan_stop_wk(struct work_struct *work)
> +static void cfg80211_sched_scan_stop_wk(struct wiphy *wiphy,
> + struct wiphy_work *work)
> {
> struct cfg80211_registered_device *rdev;
> struct cfg80211_sched_scan_request *req, *tmp;
>
In this function, of course, the locking needs to be removed, though
this other patch just changed it:
https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git/commit/?id=3e54ed8247c94c8bdf370bd872bd9dfe72b1b12b
So need to merge back wireless or something first. Or maybe just live
with the merge conflict.
johannes
