Commit 8c917f16 authored by Benjamin Berg's avatar Benjamin Berg Committed by Johannes Berg
Browse files

wifi: mac80211: do not re-add debugfs entries during resume 



The driver debugfs entries still exist when the interface is re-added
during reconfiguration. This can be either because of a HW restart
(in_reconfig) or because we are resuming.

Fixes: a1f5dcb1 ("wifi: mac80211: add a driver callback to add vif debugfs")
Signed-off-by: default avatarBenjamin Berg <benjamin.berg@intel.com>
Reviewed-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20231220043149.ddd48c66ec6b.Ia81080d92129ceecf462eceb4966bab80df12060@changeid


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

net/mac80211/driver-ops.c

+3 −3
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ int drv_add_interface(struct ieee80211_local *local, 


	sdata->flags |= IEEE80211_SDATA_IN_DRIVER;



	if (!local->in_reconfig) {

	if (!local->in_reconfig && !local->resuming) {

		drv_vif_add_debugfs(local, sdata);

		/* initially vif is not MLD */

		ieee80211_link_debugfs_drv_add(&sdata->deflink);
@@ -534,7 +534,7 @@ int drv_change_vif_links(struct ieee80211_local *local, 
	if (ret)

		return ret;



	if (!local->in_reconfig) {

	if (!local->in_reconfig && !local->resuming) {

		for_each_set_bit(link_id, &links_to_add,

				 IEEE80211_MLD_MAX_NUM_LINKS) {

			link = rcu_access_pointer(sdata->link[link_id]);
@@ -590,7 +590,7 @@ int drv_change_sta_links(struct ieee80211_local *local, 
		return ret;



	/* during reconfig don't add it to debugfs again */

	if (local->in_reconfig)

	if (local->in_reconfig || local->resuming)

		return 0;



	for_each_set_bit(link_id, &links_to_add, IEEE80211_MLD_MAX_NUM_LINKS) {