diff -Nru wpa-2.4/debian/changelog wpa-2.4/debian/changelog --- wpa-2.4/debian/changelog 2015-11-10 20:42:55.000000000 +0200 +++ wpa-2.4/debian/changelog 2016-01-19 12:36:14.000000000 +0200 @@ -1,3 +1,11 @@ +wpa (2.4-0ubuntu6) xenial; urgency=medium + + * debian/patches/wpasupplicant_band_selection_aa517ae2.patch: add the last + missing 5 GHz band selection related cherry-pick from Debian that was not + included in wpa 2.4 (LP: #1517040) + + -- Timo Jyrinki Tue, 19 Jan 2016 12:36:00 +0200 + wpa (2.4-0ubuntu5) xenial; urgency=medium * SECURITY UPDATE: unauthorized WNM Sleep Mode GTK control diff -Nru wpa-2.4/debian/patches/series wpa-2.4/debian/patches/series --- wpa-2.4/debian/patches/series 2015-11-10 20:40:46.000000000 +0200 +++ wpa-2.4/debian/patches/series 2016-01-19 12:34:11.000000000 +0200 @@ -18,3 +18,4 @@ CVE-2015-5315-2.patch CVE-2015-5316.patch CVE-2015-8041.patch +wpasupplicant_band_selection_aa517ae2.patch diff -Nru wpa-2.4/debian/patches/wpasupplicant_band_selection_aa517ae2.patch wpa-2.4/debian/patches/wpasupplicant_band_selection_aa517ae2.patch --- wpa-2.4/debian/patches/wpasupplicant_band_selection_aa517ae2.patch 1970-01-01 02:00:00.000000000 +0200 +++ wpa-2.4/debian/patches/wpasupplicant_band_selection_aa517ae2.patch 2016-01-19 12:32:00.000000000 +0200 @@ -0,0 +1,24 @@ +commit aa517ae22784aff08d3d9e38ad101b4b5c9828fb +Author: Hahn, Maital +Date: Wed Jul 8 13:13:11 2015 +0000 + + wpa_supplicant: Fix a typo in wpa_scan_result_compar() + + A typo in wpa_scan_result_compar() caused wrong scan results sorting + (and wrong roaming decision). This fixes a copy-paste regression + introduced by commit a1b790eb9d7514d1a6e0582a07f695a1564caa59 ('Select + AP based on estimated maximum throughput'). + + Signed-off-by: Maital Hahn + +--- a/wpa_supplicant/scan.c ++++ b/wpa_supplicant/scan.c +@@ -1580,7 +1580,7 @@ static int wpa_scan_result_compar(const + snr_a_full = wa->snr; + snr_a = MIN(wa->snr, GREAT_SNR); + snr_b_full = wb->snr; +- snr_b = MIN(wa->snr, GREAT_SNR); ++ snr_b = MIN(wb->snr, GREAT_SNR); + } else { + /* Level is not in dBm, so we can't calculate + * SNR. Just use raw level (units unknown). */