Proxmox-Port/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-08-25 18:02:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wifi: mac80211: remove debugfs dir for virtual monitor

Browse Source 
Don't call ieee80211_debugfs_recreate_netdev() for virtual monitor
interface when deleting it.

The virtual monitor interface shouldn't have debugfs entries and trying
to update them will *create* them on deletion.

And when the virtual monitor interface is created/destroyed multiple
times we'll get warnings about debugfs name conflicts.

Signed-off-by: Alexander Wetzel <Alexander@wetzel-home.de>
Link: https://patch.msgid.link/20250204164240.370153-1-Alexander@wetzel-home.de
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Alexander Wetzel 2025-02-04 17:42:40 +01:00 committed by Johannes Berg
parent 5b999006e3
commit 646262c71a
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/mac80211/driver-ops.c
View File

@ -116,8 +116,14 @@ void drv_remove_interface(struct ieee80211_local *local,
sdata->flags &= ~IEEE80211_SDATA_IN_DRIVER; sdata->flags &= ~IEEE80211_SDATA_IN_DRIVER;
/* Remove driver debugfs entries */ /*
ieee80211_debugfs_recreate_netdev(sdata, sdata->vif.valid_links); * Remove driver debugfs entries.
* The virtual monitor interface doesn't get a debugfs
* entry, so it's exempt here.
*/
if (sdata != local->monitor_sdata)
ieee80211_debugfs_recreate_netdev(sdata,
sdata->vif.valid_links);
trace_drv_remove_interface(local, sdata); trace_drv_remove_interface(local, sdata);
local->ops->remove_interface(&local->hw, &sdata->vif); local->ops->remove_interface(&local->hw, &sdata->vif);

11
net/mac80211/iface.c
View File

@ -1206,16 +1206,17 @@ void ieee80211_del_virtual_monitor(struct ieee80211_local *local)
return; return;
} }
RCU_INIT_POINTER(local->monitor_sdata, NULL); clear_bit(SDATA_STATE_RUNNING, &sdata->state);
mutex_unlock(&local->iflist_mtx);
synchronize_net();
ieee80211_link_release_channel(&sdata->deflink); ieee80211_link_release_channel(&sdata->deflink);
if (ieee80211_hw_check(&local->hw, WANT_MONITOR_VIF)) if (ieee80211_hw_check(&local->hw, WANT_MONITOR_VIF))
drv_remove_interface(local, sdata); drv_remove_interface(local, sdata);
RCU_INIT_POINTER(local->monitor_sdata, NULL);
mutex_unlock(&local->iflist_mtx);
synchronize_net();
kfree(sdata); kfree(sdata);
} }