diff options
| author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2009-02-21 00:24:13 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-02-27 14:52:59 -0500 |
| commit | d1c96a9a29a5f34fa50133889b6110dca6cc3d43 (patch) | |
| tree | b933187d131af5f14fe06978c001cb38e010a3c3 /net | |
| parent | 84540869678649074ae040bc9b063ef38ec9c83a (diff) | |
| download | linux-d1c96a9a29a5f34fa50133889b6110dca6cc3d43.tar.bz2 | |
cfg80211: make __regulatory_hint() static
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireless/reg.c | 23 | ||||
| -rw-r--r-- | net/wireless/reg.h | 23 |
2 files changed, 21 insertions, 25 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index e5e432d6af34..0253d01cde97 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -1324,8 +1324,27 @@ static int ignore_request(struct wiphy *wiphy, enum reg_set_by set_by, return -EINVAL; } -/* Caller must hold &cfg80211_mutex */ -int __regulatory_hint(struct wiphy *wiphy, enum reg_set_by set_by, +/** + * __regulatory_hint - hint to the wireless core a regulatory domain + * @wiphy: if the hint comes from country information from an AP, this + * is required to be set to the wiphy that received the information + * @alpha2: the ISO/IEC 3166 alpha2 being claimed the regulatory domain + * should be in. + * @country_ie_checksum: checksum of processed country IE, set this to 0 + * if the hint did not come from a country IE + * @country_ie_env: the environment the IE told us we are in, %ENVIRON_* + * + * The Wireless subsystem can use this function to hint to the wireless core + * what it believes should be the current regulatory domain by giving it an + * ISO/IEC 3166 alpha2 country code it knows its regulatory domain should be + * in. + * + * Returns zero if all went fine, %-EALREADY if a regulatory domain had + * already been set or other standard error codes. + * + * Caller must hold &cfg80211_mutex + */ +static int __regulatory_hint(struct wiphy *wiphy, enum reg_set_by set_by, const char *alpha2, u32 country_ie_checksum, enum environment_cap env) diff --git a/net/wireless/reg.h b/net/wireless/reg.h index 65bfd0558ce1..e37829a49dc4 100644 --- a/net/wireless/reg.h +++ b/net/wireless/reg.h @@ -16,29 +16,6 @@ void regulatory_exit(void); int set_regdom(const struct ieee80211_regdomain *rd); /** - * __regulatory_hint - hint to the wireless core a regulatory domain - * @wiphy: if the hint comes from country information from an AP, this - * is required to be set to the wiphy that received the information - * @alpha2: the ISO/IEC 3166 alpha2 being claimed the regulatory domain - * should be in. - * @country_ie_checksum: checksum of processed country IE, set this to 0 - * if the hint did not come from a country IE - * @country_ie_env: the environment the IE told us we are in, %ENVIRON_* - * - * The Wireless subsystem can use this function to hint to the wireless core - * what it believes should be the current regulatory domain by giving it an - * ISO/IEC 3166 alpha2 country code it knows its regulatory domain should be - * in. - * - * Returns zero if all went fine, %-EALREADY if a regulatory domain had - * already been set or other standard error codes. - * - */ -extern int __regulatory_hint(struct wiphy *wiphy, enum reg_set_by set_by, - const char *alpha2, u32 country_ie_checksum, - enum environment_cap country_ie_env); - -/** * regulatory_hint_found_beacon - hints a beacon was found on a channel * @wiphy: the wireless device where the beacon was found on * @beacon_chan: the channel on which the beacon was found on |