aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2009-02-21 00:24:13 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-02-27 14:52:59 -0500
commitd1c96a9a29a5f34fa50133889b6110dca6cc3d43 (patch)
treeb933187d131af5f14fe06978c001cb38e010a3c3 /net/wireless
parent84540869678649074ae040bc9b063ef38ec9c83a (diff)
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/wireless')
-rw-r--r--net/wireless/reg.c23
-rw-r--r--net/wireless/reg.h23
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,
1324 return -EINVAL; 1324 return -EINVAL;
1325} 1325}
1326 1326
1327/* Caller must hold &cfg80211_mutex */ 1327/**
1328int __regulatory_hint(struct wiphy *wiphy, enum reg_set_by set_by, 1328 * __regulatory_hint - hint to the wireless core a regulatory domain
1329 * @wiphy: if the hint comes from country information from an AP, this
1330 * is required to be set to the wiphy that received the information
1331 * @alpha2: the ISO/IEC 3166 alpha2 being claimed the regulatory domain
1332 * should be in.
1333 * @country_ie_checksum: checksum of processed country IE, set this to 0
1334 * if the hint did not come from a country IE
1335 * @country_ie_env: the environment the IE told us we are in, %ENVIRON_*
1336 *
1337 * The Wireless subsystem can use this function to hint to the wireless core
1338 * what it believes should be the current regulatory domain by giving it an
1339 * ISO/IEC 3166 alpha2 country code it knows its regulatory domain should be
1340 * in.
1341 *
1342 * Returns zero if all went fine, %-EALREADY if a regulatory domain had
1343 * already been set or other standard error codes.
1344 *
1345 * Caller must hold &cfg80211_mutex
1346 */
1347static int __regulatory_hint(struct wiphy *wiphy, enum reg_set_by set_by,
1329 const char *alpha2, 1348 const char *alpha2,
1330 u32 country_ie_checksum, 1349 u32 country_ie_checksum,
1331 enum environment_cap env) 1350 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);
16int set_regdom(const struct ieee80211_regdomain *rd); 16int set_regdom(const struct ieee80211_regdomain *rd);
17 17
18/** 18/**
19 * __regulatory_hint - hint to the wireless core a regulatory domain
20 * @wiphy: if the hint comes from country information from an AP, this
21 * is required to be set to the wiphy that received the information
22 * @alpha2: the ISO/IEC 3166 alpha2 being claimed the regulatory domain
23 * should be in.
24 * @country_ie_checksum: checksum of processed country IE, set this to 0
25 * if the hint did not come from a country IE
26 * @country_ie_env: the environment the IE told us we are in, %ENVIRON_*
27 *
28 * The Wireless subsystem can use this function to hint to the wireless core
29 * what it believes should be the current regulatory domain by giving it an
30 * ISO/IEC 3166 alpha2 country code it knows its regulatory domain should be
31 * in.
32 *
33 * Returns zero if all went fine, %-EALREADY if a regulatory domain had
34 * already been set or other standard error codes.
35 *
36 */
37extern int __regulatory_hint(struct wiphy *wiphy, enum reg_set_by set_by,
38 const char *alpha2, u32 country_ie_checksum,
39 enum environment_cap country_ie_env);
40
41/**
42 * regulatory_hint_found_beacon - hints a beacon was found on a channel 19 * regulatory_hint_found_beacon - hints a beacon was found on a channel
43 * @wiphy: the wireless device where the beacon was found on 20 * @wiphy: the wireless device where the beacon was found on
44 * @beacon_chan: the channel on which the beacon was found on 21 * @beacon_chan: the channel on which the beacon was found on