mac80211: remove unused and unneeded remove_sta_debugfs callback (612fcfd9) · Commits · 戴 / test

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>

include/net/mac80211.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -5946,7 +5946,6 @@ struct rate_control_ops {

		void (add_sta_debugfs)(void priv, void *priv_sta,
		struct dentry *dir);
		void (remove_sta_debugfs)(void priv, void *priv_sta);

		u32 (get_expected_throughput)(void priv_sta);
		};

net/mac80211/rate.h

+0 −9

Original line number	Diff line number	Diff line
		@@ -60,15 +60,6 @@ static inline void rate_control_add_sta_debugfs(struct sta_info *sta)
		#endif
		}

		static inline void rate_control_remove_sta_debugfs(struct sta_info *sta)
		{
		#ifdef CONFIG_MAC80211_DEBUGFS
		struct rate_control_ref *ref = sta->rate_ctrl;
		if (ref && ref->ops->remove_sta_debugfs)
		ref->ops->remove_sta_debugfs(ref->priv, sta->rate_ctrl_priv);
		#endif
		}

		void ieee80211_check_rate_mask(struct ieee80211_sub_if_data *sdata);

		/* Get a reference to the rate control algorithm. If `name' is NULL, get the

net/mac80211/sta_info.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -1065,7 +1065,6 @@ static void __sta_info_destroy_part2(struct sta_info *sta)
		cfg80211_del_sta_sinfo(sdata->dev, sta->sta.addr, sinfo, GFP_KERNEL);
		kfree(sinfo);

		rate_control_remove_sta_debugfs(sta);
		ieee80211_sta_debugfs_remove(sta);

		cleanup_single_sta(sta);

Admin message