aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/wireless.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-09-15 07:11:19 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-09-24 16:17:59 -0400
commite07aa3783e9f66b03d72e7afd9f709d7f7059662 (patch)
tree9716ec591334e8b6d1fe04afa58822d889dfdfee /include/net/wireless.h
parent942b25cf9028e7c2f6446ee7c6618bd70dafec5f (diff)
cfg80211: fix code ordering in header file
Luis added the regulatory hint stuff to this file without observing that __ieee80211_get_channel and ieee80211_get_channel really belong together. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net/wireless.h')
-rw-r--r--include/net/wireless.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/include/net/wireless.h b/include/net/wireless.h
index e4378cc6bf8e..0de7fde9f336 100644
--- a/include/net/wireless.h
+++ b/include/net/wireless.h
@@ -329,6 +329,15 @@ extern int ieee80211_frequency_to_channel(int freq);
329extern struct ieee80211_channel *__ieee80211_get_channel(struct wiphy *wiphy, 329extern struct ieee80211_channel *__ieee80211_get_channel(struct wiphy *wiphy,
330 int freq); 330 int freq);
331/** 331/**
332 * ieee80211_get_channel - get channel struct from wiphy for specified frequency
333 */
334static inline struct ieee80211_channel *
335ieee80211_get_channel(struct wiphy *wiphy, int freq)
336{
337 return __ieee80211_get_channel(wiphy, freq);
338}
339
340/**
332 * __regulatory_hint - hint to the wireless core a regulatory domain 341 * __regulatory_hint - hint to the wireless core a regulatory domain
333 * @wiphy: if a driver is providing the hint this is the driver's very 342 * @wiphy: if a driver is providing the hint this is the driver's very
334 * own &struct wiphy 343 * own &struct wiphy
@@ -380,13 +389,4 @@ extern int __regulatory_hint(struct wiphy *wiphy, enum reg_set_by set_by,
380 */ 389 */
381extern int regulatory_hint(struct wiphy *wiphy, 390extern int regulatory_hint(struct wiphy *wiphy,
382 const char *alpha2, struct ieee80211_regdomain *rd); 391 const char *alpha2, struct ieee80211_regdomain *rd);
383
384/**
385 * ieee80211_get_channel - get channel struct from wiphy for specified frequency
386 */
387static inline struct ieee80211_channel *
388ieee80211_get_channel(struct wiphy *wiphy, int freq)
389{
390 return __ieee80211_get_channel(wiphy, freq);
391}
392#endif /* __NET_WIRELESS_H */ 392#endif /* __NET_WIRELESS_H */