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

Commit 90869b24 authored by Jean Tourrilhes's avatar Jean Tourrilhes Committed by John W. Linville
Browse files

[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: default avatarJean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4ad13663

net/ieee80211/ieee80211_wx.c

+2 −5
Original line number Diff line number Diff line
@@ -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 */