aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Tourrilhes <jt@hpl.hp.com>2007-07-10 16:51:14 -0400
committerJohn W. Linville <linville@tuxdriver.com>2007-07-17 21:56:17 -0400
commit90869b249b4621d60920d5d1d53403fe86d8ecb5 (patch)
treefb51cca8e33e5fbc177cc413a84d9983c657a0b3
parent4ad1366376bfef32ec0ffa12d1faa483d6f330bd (diff)
[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>
-rw-r--r--net/ieee80211/ieee80211_wx.c7
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,
90 } 90 }
91 91
92 /* Add channel and frequency */ 92 /* Add channel and frequency */
93 /* Note : userspace automatically computes channel using iwrange */
93 iwe.cmd = SIOCGIWFREQ; 94 iwe.cmd = SIOCGIWFREQ;
94 iwe.u.freq.m = network->channel;
95 iwe.u.freq.e = 0;
96 iwe.u.freq.i = 0;
97 start = iwe_stream_add_event(start, stop, &iwe, IW_EV_FREQ_LEN);
98
99 iwe.u.freq.m = ieee80211_channel_to_freq(ieee, network->channel); 95 iwe.u.freq.m = ieee80211_channel_to_freq(ieee, network->channel);
100 iwe.u.freq.e = 6; 96 iwe.u.freq.e = 6;
97 iwe.u.freq.i = 0;
101 start = iwe_stream_add_event(start, stop, &iwe, IW_EV_FREQ_LEN); 98 start = iwe_stream_add_event(start, stop, &iwe, IW_EV_FREQ_LEN);
102 99
103 /* Add encryption capability */ 100 /* Add encryption capability */