summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-12 10:26:58 -0400
committerJohannes Berg <johannes.berg@intel.com>2019-07-26 07:21:12 -0400
commit612fcfd9b31f08858d2a2e1279adda367e1ade00 (patch)
tree955945cc0435f7a4f71e9b3718d9837d55a2874f
parent09e1946cb7590d1a7a314534420f05c7abdf1f55 (diff)
mac80211: remove unused and unneeded remove_sta_debugfs callback
The remove_sta_debugfs callback in struct rate_control_ops is no longer used by any driver, as there is no need for it (the debugfs directory is already removed recursivly by the mac80211 core.) Because no one needs it, just remove it to keep anyone else from accidentally using it in the future. Cc: Johannes Berg <johannes@sipsolutions.net> Cc: "David S. Miller" <davem@davemloft.net> Cc: linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Link: https://lore.kernel.org/r/20190612142658.12792-5-gregkh@linuxfoundation.org Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--include/net/mac80211.h1
-rw-r--r--net/mac80211/rate.h9
-rw-r--r--net/mac80211/sta_info.c1
3 files changed, 0 insertions, 11 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index e39bf85ae4c2..6cc5b25edf9d 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -5946,7 +5946,6 @@ struct rate_control_ops {
5946 5946
5947 void (*add_sta_debugfs)(void *priv, void *priv_sta, 5947 void (*add_sta_debugfs)(void *priv, void *priv_sta,
5948 struct dentry *dir); 5948 struct dentry *dir);
5949 void (*remove_sta_debugfs)(void *priv, void *priv_sta);
5950 5949
5951 u32 (*get_expected_throughput)(void *priv_sta); 5950 u32 (*get_expected_throughput)(void *priv_sta);
5952}; 5951};
diff --git a/net/mac80211/rate.h b/net/mac80211/rate.h
index 5d5348bc41ec..5397c6dad056 100644
--- a/net/mac80211/rate.h
+++ b/net/mac80211/rate.h
@@ -60,15 +60,6 @@ static inline void rate_control_add_sta_debugfs(struct sta_info *sta)
60#endif 60#endif
61} 61}
62 62
63static inline void rate_control_remove_sta_debugfs(struct sta_info *sta)
64{
65#ifdef CONFIG_MAC80211_DEBUGFS
66 struct rate_control_ref *ref = sta->rate_ctrl;
67 if (ref && ref->ops->remove_sta_debugfs)
68 ref->ops->remove_sta_debugfs(ref->priv, sta->rate_ctrl_priv);
69#endif
70}
71
72void ieee80211_check_rate_mask(struct ieee80211_sub_if_data *sdata); 63void ieee80211_check_rate_mask(struct ieee80211_sub_if_data *sdata);
73 64
74/* Get a reference to the rate control algorithm. If `name' is NULL, get the 65/* Get a reference to the rate control algorithm. If `name' is NULL, get the
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 95eb8220e2e4..fb6614f57cbc 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -1065,7 +1065,6 @@ static void __sta_info_destroy_part2(struct sta_info *sta)
1065 cfg80211_del_sta_sinfo(sdata->dev, sta->sta.addr, sinfo, GFP_KERNEL); 1065 cfg80211_del_sta_sinfo(sdata->dev, sta->sta.addr, sinfo, GFP_KERNEL);
1066 kfree(sinfo); 1066 kfree(sinfo);
1067 1067
1068 rate_control_remove_sta_debugfs(sta);
1069 ieee80211_sta_debugfs_remove(sta); 1068 ieee80211_sta_debugfs_remove(sta);
1070 1069
1071 cleanup_single_sta(sta); 1070 cleanup_single_sta(sta);