From: Johannes Berg Date: Mon, 11 Dec 2023 07:05:19 +0000 (+0200) Subject: wifi: mac80211: don't re-add debugfs during reconfig X-Git-Tag: v6.6.14~1044 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=35de90d7fab8289d5fbd31406dde0b8944304113;p=platform%2Fkernel%2Flinux-starfive.git wifi: mac80211: don't re-add debugfs during reconfig [ Upstream commit 63bafd9d5421959b2124dd940ed8d7462d99f449 ] If we're doing reconfig, then we cannot add the debugfs files that are already there from before the reconfig. Skip that in drv_change_sta_links() during reconfig. Fixes: d2caad527c19 ("wifi: mac80211: add API to show the link STAs in debugfs") Signed-off-by: Johannes Berg Reviewed-by: Gregory Greenman Reviewed-by: Benjamin Berg Signed-off-by: Miri Korenblit Link: https://msgid.link/20231211085121.88a950f43e16.Id71181780994649219685887c0fcad33d387cc78@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- diff --git a/net/mac80211/driver-ops.c b/net/mac80211/driver-ops.c index aa37a14..f8af0c3 100644 --- a/net/mac80211/driver-ops.c +++ b/net/mac80211/driver-ops.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright 2015 Intel Deutschland GmbH - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation */ #include #include "ieee80211_i.h" @@ -564,6 +564,10 @@ int drv_change_sta_links(struct ieee80211_local *local, if (ret) return ret; + /* during reconfig don't add it to debugfs again */ + if (local->in_reconfig) + return 0; + for_each_set_bit(link_id, &links_to_add, IEEE80211_MLD_MAX_NUM_LINKS) { link_sta = rcu_dereference_protected(info->link[link_id], lockdep_is_held(&local->sta_mtx));