[PATCH] softmac: Channel is listed twice in scan output

SoftMAC outputs the channel twice in the scan output. It should
display frequency and channel, but only once for each.

Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 2 insertions, 5 deletions

diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
index 523a137d49dd..465b73d50532 100644
--- a/net/ieee80211/ieee80211_wx.c
+++ b/net/ieee80211/ieee80211_wx.c
@@ -90,14 +90,11 @@ static char *ieee80211_translate_scan(struct ieee80211_device *ieee,
         }
 
         /* Add channel and frequency */
+        /* Note : userspace automatically computes channel using iwrange */
         iwe.cmd = SIOCGIWFREQ;
-        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;
+        iwe.u.freq.i = 0;
         start = iwe_stream_add_event(start, stop, &iwe, IW_EV_FREQ_LEN);
 
         /* Add encryption capability */