Skip to content

Commit

Permalink
[PATCH] ieee80211: add ieee80211_channel_to_freq
Browse files Browse the repository at this point in the history
The routines that interrogate the ieee80211_geo struct are missing a
channel to frequency entry. This patch adds it.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Larry Finger authored and John W. Linville committed May 8, 2007
1 parent 5b94f67 commit f5cdf30
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
2 changes: 2 additions & 0 deletions include/net/ieee80211.h
Original file line number Diff line number Diff line change
Expand Up @@ -1291,6 +1291,8 @@ extern u8 ieee80211_get_channel_flags(struct ieee80211_device *ieee,
extern const struct ieee80211_channel *ieee80211_get_channel(struct
ieee80211_device
*ieee, u8 channel);
extern u32 ieee80211_channel_to_freq(struct ieee80211_device * ieee,
u8 channel);

/* ieee80211_wx.c */
extern int ieee80211_wx_get_scan(struct ieee80211_device *ieee,
Expand Down
16 changes: 16 additions & 0 deletions net/ieee80211/ieee80211_geo.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,21 @@ int ieee80211_channel_to_index(struct ieee80211_device *ieee, u8 channel)
return -1;
}

u32 ieee80211_channel_to_freq(struct ieee80211_device * ieee, u8 channel)
{
const struct ieee80211_channel * ch;

/* Driver needs to initialize the geography map before using
* these helper functions */
if (ieee->geo.bg_channels == 0 && ieee->geo.a_channels == 0)
return 0;

ch = ieee80211_get_channel(ieee, channel);
if (!ch->channel)
return 0;
return ch->freq;
}

u8 ieee80211_freq_to_channel(struct ieee80211_device * ieee, u32 freq)
{
int i;
Expand Down Expand Up @@ -174,6 +189,7 @@ EXPORT_SYMBOL(ieee80211_get_channel);
EXPORT_SYMBOL(ieee80211_get_channel_flags);
EXPORT_SYMBOL(ieee80211_is_valid_channel);
EXPORT_SYMBOL(ieee80211_freq_to_channel);
EXPORT_SYMBOL(ieee80211_channel_to_freq);
EXPORT_SYMBOL(ieee80211_channel_to_index);
EXPORT_SYMBOL(ieee80211_set_geo);
EXPORT_SYMBOL(ieee80211_get_geo);

0 comments on commit f5cdf30

Please sign in to comment.