diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2007-04-21 17:56:43 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2007-05-08 11:51:59 -0400 |
| commit | 93afe3da36440456ecec8ae9846b12729713cec7 (patch) | |
| tree | 64e801cb4c6f186889befd79724f90bff3523d47 /net | |
| parent | f5cdf30618cf855c2043e5c0c131ebb120929864 (diff) | |
| download | linux-93afe3da36440456ecec8ae9846b12729713cec7.tar.gz linux-93afe3da36440456ecec8ae9846b12729713cec7.tar.bz2 linux-93afe3da36440456ecec8ae9846b12729713cec7.zip | |
[PATCH] ieee80211: include frequency in scan results
In ieee80211, the output of scan results lists channels, but not
frequencies, which are needed by NetworkManager. This patch uses
the new ieee80211_channel_to_freq routine to add the frequency to the output.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ieee80211/ieee80211_wx.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c index cee5e13bc427..523a137d49dd 100644 --- a/net/ieee80211/ieee80211_wx.c +++ b/net/ieee80211/ieee80211_wx.c @@ -89,15 +89,17 @@ static char *ieee80211_translate_scan(struct ieee80211_device *ieee, start = iwe_stream_add_event(start, stop, &iwe, IW_EV_UINT_LEN); } - /* Add frequency/channel */ + /* Add channel and frequency */ iwe.cmd = SIOCGIWFREQ; -/* iwe.u.freq.m = ieee80211_frequency(network->channel, network->mode); - iwe.u.freq.e = 3; */ iwe.u.freq.m = network->channel; iwe.u.freq.e = 0; iwe.u.freq.i = 0; start = iwe_stream_add_event(start, stop, &iwe, IW_EV_FREQ_LEN); + iwe.u.freq.m = ieee80211_channel_to_freq(ieee, network->channel); + iwe.u.freq.e = 6; + start = iwe_stream_add_event(start, stop, &iwe, IW_EV_FREQ_LEN); + /* Add encryption capability */ iwe.cmd = SIOCGIWENCODE; if (network->capability & WLAN_CAPABILITY_PRIVACY) |