summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-09-15 13:11:19 +0200
committerJohn W. Linville <linville@tuxdriver.com>2008-09-24 22:17:59 +0200
commite07aa3783e9f66b03d72e7afd9f709d7f7059662 (patch)
tree9716ec591334e8b6d1fe04afa58822d889dfdfee /include/net
parentcfg80211: clean up static regdomain mess (diff)
downloadlinux-e07aa3783e9f66b03d72e7afd9f709d7f7059662.tar.xz
linux-e07aa3783e9f66b03d72e7afd9f709d7f7059662.zip
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')
-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);
extern struct ieee80211_channel *__ieee80211_get_channel(struct wiphy *wiphy,
int freq);
/**
+ * ieee80211_get_channel - get channel struct from wiphy for specified frequency
+ */
+static inline struct ieee80211_channel *
+ieee80211_get_channel(struct wiphy *wiphy, int freq)
+{
+ return __ieee80211_get_channel(wiphy, freq);
+}
+
+/**
* __regulatory_hint - hint to the wireless core a regulatory domain
* @wiphy: if a driver is providing the hint this is the driver's very
* own &struct wiphy
@@ -380,13 +389,4 @@ extern int __regulatory_hint(struct wiphy *wiphy, enum reg_set_by set_by,
*/
extern int regulatory_hint(struct wiphy *wiphy,
const char *alpha2, struct ieee80211_regdomain *rd);
-
-/**
- * ieee80211_get_channel - get channel struct from wiphy for specified frequency
- */
-static inline struct ieee80211_channel *
-ieee80211_get_channel(struct wiphy *wiphy, int freq)
-{
- return __ieee80211_get_channel(wiphy, freq);
-}
#endif /* __NET_WIRELESS_H */