diff options
-rw-r--r-- | include/net/mac80211.h | 1 | ||||
-rw-r--r-- | net/mac80211/rate.h | 9 | ||||
-rw-r--r-- | net/mac80211/sta_info.c | 1 |
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 | ||
63 | static 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 | |||
72 | void ieee80211_check_rate_mask(struct ieee80211_sub_if_data *sdata); | 63 | void 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); |