* [PATCH] cfg80211: don't export cfg80211_iter_combinations()
@ 2016-10-21 10:19 Johannes Berg
2016-10-21 10:24 ` Johannes Berg
0 siblings, 1 reply; 2+ messages in thread
From: Johannes Berg @ 2016-10-21 10:19 UTC (permalink / raw)
To: linux-wireless; +Cc: Johannes Berg
From: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] cfg80211: don't export cfg80211_iter_combinations()
2016-10-21 10:19 [PATCH] cfg80211: don't export cfg80211_iter_combinations() Johannes Berg
@ 2016-10-21 10:24 ` Johannes Berg
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Berg @ 2016-10-21 10:24 UTC (permalink / raw)
To: linux-wireless
On Fri, 2016-10-21 at 12:19 +0200, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> 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.
>
Err, obviously my git grep foo failed me ... :)
johannes
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-10-21 10:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-21 10:19 [PATCH] cfg80211: don't export cfg80211_iter_combinations() Johannes Berg
2016-10-21 10:24 ` Johannes Berg
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.