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

Commit 9381be05 authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville
Browse files

mac80211: reorder channel and freq reporting in wext scan report 



This patch switch order of channel and freq (SIOCGIWFREQ) reports
in scan results in order to overcome wpa_supplicant inability
to handle channel numbers in 5.2Ghz band.
Wext reporting channel number is ambiguous as channels 7-12 (802.11j)
exist on both bands.

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Acked-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3bf0a32e

net/mac80211/mlme.c

+4 −5
Original line number Diff line number Diff line
@@ -4099,18 +4099,17 @@ ieee80211_sta_scan_result(struct net_device *dev, 


	memset(&iwe, 0, sizeof(iwe));

	iwe.cmd = SIOCGIWFREQ;

	iwe.u.freq.m = bss->freq;

	iwe.u.freq.e = 6;

	iwe.u.freq.m = ieee80211_frequency_to_channel(bss->freq);

	iwe.u.freq.e = 0;

	current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,

					  IW_EV_FREQ_LEN);



	memset(&iwe, 0, sizeof(iwe));

	iwe.cmd = SIOCGIWFREQ;

	iwe.u.freq.m = ieee80211_frequency_to_channel(bss->freq);

	iwe.u.freq.e = 0;

	iwe.u.freq.m = bss->freq;

	iwe.u.freq.e = 6;

	current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,

					  IW_EV_FREQ_LEN);



	memset(&iwe, 0, sizeof(iwe));

	iwe.cmd = IWEVQUAL;

	iwe.u.qual.qual = bss->signal;