[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>

diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
index cee5e13bc4270687f76cea2330543f3d373930c7..523a137d49dd2b083406ee8517939f4c7e29c542 100644 (file)
--- 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)