diff options
author | Johannes Berg <johannes.berg@intel.com> | 2015-07-17 13:39:38 (GMT) |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2015-07-17 13:39:41 (GMT) |
commit | 72bbe3d1c2d7a9e257956912040ffc7ba9f71e0d (patch) | |
tree | 8f014bc8663c3e0eec3250ceb46ca18674e8932a /net/mac80211/debugfs_netdev.c | |
parent | 322cd406da0b102dda9c0eec46181458a3667dbb (diff) | |
parent | 923b352f19d9ea971ae2536eab55f5fc9e95fedf (diff) | |
download | linux-72bbe3d1c2d7a9e257956912040ffc7ba9f71e0d.tar.xz |
Merge branch 'mac80211' into mac80211-next
This is necessary to merge the new TDLS and mesh patches,
as they depend on some fixes.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/debugfs_netdev.c')
-rw-r--r-- | net/mac80211/debugfs_netdev.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c index 29236e8..c09c013 100644 --- a/net/mac80211/debugfs_netdev.c +++ b/net/mac80211/debugfs_netdev.c @@ -723,6 +723,7 @@ void ieee80211_debugfs_remove_netdev(struct ieee80211_sub_if_data *sdata) debugfs_remove_recursive(sdata->vif.debugfs_dir); sdata->vif.debugfs_dir = NULL; + sdata->debugfs.subdir_stations = NULL; } void ieee80211_debugfs_rename_netdev(struct ieee80211_sub_if_data *sdata) |