Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5cdf306 authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

[PATCH] ieee80211: add ieee80211_channel_to_freq 



The routines that interrogate the ieee80211_geo struct are missing a
channel to frequency entry. This patch adds it.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5b94f675

include/net/ieee80211.h

+2 −0
Original line number Diff line number Diff line
@@ -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,

net/ieee80211/ieee80211_geo.c

+16 −0
Original line number Diff line number Diff line
@@ -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;
@@ -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);