From: Johannes Berg <[email protected]> Nothing uses it outside of cfg80211, and since only cfg80211_check_combinations() uses it in the same file it can even be static - do that.
Signed-off-by: Johannes Berg <[email protected]> --- include/net/cfg80211.h | 18 ------------------ net/wireless/util.c | 12 ++++++------ 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index ec39f891b7a3..db3d020d7349 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -5628,24 +5628,6 @@ unsigned int ieee80211_get_num_supported_channels(struct wiphy *wiphy); int cfg80211_check_combinations(struct wiphy *wiphy, struct iface_combination_params *params); -/** - * cfg80211_iter_combinations - iterate over matching combinations - * - * @wiphy: the wiphy - * @params: the interface combinations parameter - * @iter: function to call for each matching combination - * @data: pointer to pass to iter function - * - * This function can be called by the driver to check what possible - * combinations it fits in at a given moment, e.g. for channel switching - * purposes. - */ -int cfg80211_iter_combinations(struct wiphy *wiphy, - struct iface_combination_params *params, - void (*iter)(const struct ieee80211_iface_combination *c, - void *data), - void *data); - /* * cfg80211_stop_iface - trigger interface disconnection * diff --git a/net/wireless/util.c b/net/wireless/util.c index 78bf53705466..8a244fb769e6 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -1601,11 +1601,12 @@ int cfg80211_validate_beacon_int(struct cfg80211_registered_device *rdev, return cfg80211_check_combinations(&rdev->wiphy, ¶ms); } -int cfg80211_iter_combinations(struct wiphy *wiphy, - struct iface_combination_params *params, - void (*iter)(const struct ieee80211_iface_combination *c, - void *data), - void *data) +static int +cfg80211_iter_combinations(struct wiphy *wiphy, + struct iface_combination_params *params, + void (*iter)(const struct ieee80211_iface_combination *c, + void *data), + void *data) { const struct ieee80211_regdomain *regdom; enum nl80211_dfs_regions region = 0; @@ -1694,7 +1695,6 @@ int cfg80211_iter_combinations(struct wiphy *wiphy, return 0; } -EXPORT_SYMBOL(cfg80211_iter_combinations); static void cfg80211_iter_sum_ifcombs(const struct ieee80211_iface_combination *c, -- 2.8.1
