[pkg-wpa-devel] r1717 - in /wpa/trunk/debian: ./ patches/ patches/upstream/
slh-guest at users.alioth.debian.org
slh-guest at users.alioth.debian.org
Fri Apr 13 21:36:27 UTC 2012
Author: slh-guest
Date: Fri Apr 13 21:36:26 2012
New Revision: 1717
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1717
Log:
import git patches up to hostap_0_7_2-1519-gfee70d7.
Added:
wpa/trunk/debian/patches/upstream/0059-P2P-Validate-p2p_oper_channel-in-p2p_group_add.patch
wpa/trunk/debian/patches/upstream/0060-P2P-Do-not-use-group-idle-timeout-during-provisionin.patch
wpa/trunk/debian/patches/upstream/0061-Sync-with-include-linux-nl80211.h-from-wireless-test.patch
wpa/trunk/debian/patches/upstream/0062-P2P-Add-support-for-preferred-channel-list.patch
wpa/trunk/debian/patches/upstream/0063-Clear-previous-BSSID-on-explicit-disconnection-reque.patch
wpa/trunk/debian/patches/upstream/0064-P2P-Use-P2P-Device-ID-attribute-if-Device-Info-not-a.patch
wpa/trunk/debian/patches/upstream/0065-Fix-potential-double-free-and-use-of-freed-memory-in.patch
wpa/trunk/debian/patches/upstream/0066-Fix-memory-leaks-on-radius_client_send-error-paths.patch
wpa/trunk/debian/patches/upstream/0067-P2P-Add-deinit_p2p_cli-op-to-clear-P2P-client-driver.patch
wpa/trunk/debian/patches/upstream/0068-P2P-Notify-about-disconnection-only-when-needed.patch
wpa/trunk/debian/patches/upstream/0069-Change-reason-code-for-AP-mode-BSS-termination-to-3.patch
wpa/trunk/debian/patches/upstream/0070-Save-bgscan-parameter-into-configuration-file.patch
wpa/trunk/debian/patches/upstream/0071-Clarify-comment-in-wpa_supplicant-defconfig.patch
wpa/trunk/debian/patches/upstream/0072-P2P-Fix-crash-for-failure-case-when-WSC-PIN-is-enter.patch
wpa/trunk/debian/patches/upstream/0073-P2P-Disconnect-P2P-group-on-supplicant-deinit.patch
Modified:
wpa/trunk/debian/changelog
wpa/trunk/debian/patches/series
wpa/trunk/debian/patches/upstream/0001-Fix-ap_sta_disconnect-to-clear-EAPOL-WPA-authenticat.patch
wpa/trunk/debian/patches/upstream/0002-P2P-Fix-WSC-IE-inclusion-for-P2P-disabled-case.patch
wpa/trunk/debian/patches/upstream/0003-WPS-Fix-an-interoperability-issue-with-mixed-mode-an.patch
wpa/trunk/debian/patches/upstream/0004-dbus-Create-DBus-getter-setter-for-FastReauth.patch
wpa/trunk/debian/patches/upstream/0005-dbus-Fix-endianness-bug-in-Frequency-and-Signal-prop.patch
wpa/trunk/debian/patches/upstream/0006-wpa_debug-Support-outputting-hexdumps-into-syslog.patch
wpa/trunk/debian/patches/upstream/0007-dbus-Remove-unused-D-Bus-version-defines.patch
wpa/trunk/debian/patches/upstream/0008-build-Fix-install-target-parent-directory-prerequisi.patch
wpa/trunk/debian/patches/upstream/0009-Install-only-the-binaries-into-BINDIR.patch
wpa/trunk/debian/patches/upstream/0010-SME-Fix-processing-of-Authentication-timeout-and-fai.patch
wpa/trunk/debian/patches/upstream/0011-WPS-Disable-AP-PIN-after-10-consecutive-failures.patch
wpa/trunk/debian/patches/upstream/0012-Interworking-Fix-EAP-TTLS-MSCHAP-configuration.patch
wpa/trunk/debian/patches/upstream/0013-Clear-EAPOL-authenticator-authFail-for-PMKSA-caching.patch
wpa/trunk/debian/patches/upstream/0014-Delay-scan-request-on-select_network-if-disconnectin.patch
wpa/trunk/debian/patches/upstream/0015-P2P-Fix-DBus-crash-and-return-additional-P2P-group-p.patch
wpa/trunk/debian/patches/upstream/0016-P2P-Fix-the-setter-function-for-DBus-group-propertie.patch
wpa/trunk/debian/patches/upstream/0017-Try-fallback-drivers-if-global-init-for-preferred-dr.patch
wpa/trunk/debian/patches/upstream/0018-P2P-Remove-unneeded-go_neg_peer-check-from-PD.patch
wpa/trunk/debian/patches/upstream/0019-P2P-Skip-event-notification-on-PD-Response-in-join-g.patch
wpa/trunk/debian/patches/upstream/0020-P2P-Wait-for-PD-before-join-response.patch
wpa/trunk/debian/patches/upstream/0021-Move-AP-events-for-STA-connected-disconnected-into-o.patch
wpa/trunk/debian/patches/upstream/0022-P2P-Send-STA-connected-disconnected-events-to-parent.patch
wpa/trunk/debian/patches/upstream/0023-P2P-Append-P2P-Device-Address-to-AP-STA-DISCONNECTED.patch
wpa/trunk/debian/patches/upstream/0024-P2P-Maintain-a-list-of-P2P-Clients-for-persistent-gr.patch
wpa/trunk/debian/patches/upstream/0025-P2P-Set-Invitation-Type-to-1-for-GO-inviting-to-a-pe.patch
wpa/trunk/debian/patches/upstream/0026-P2P-Allow-BSS-entry-to-be-fetched-based-on-GO-P2P-De.patch
wpa/trunk/debian/patches/upstream/0027-P2P-Move-p2p_add_device-prototype-to-correct-header-.patch
wpa/trunk/debian/patches/upstream/0028-P2P-Fix-p2p_scan-error-processing-in-p2p_search.patch
wpa/trunk/debian/patches/upstream/0029-P2P-Avoid-re-starting-p2p_search-in-some-corner-case.patch
wpa/trunk/debian/patches/upstream/0030-P2P-Do-not-expire-GO-peer-entry-during-group-rekeyin.patch
wpa/trunk/debian/patches/upstream/0031-EAP-pwd-Describe-build-option-for-EAP-pwd.patch
wpa/trunk/debian/patches/upstream/0032-WPS-Fix-regression-in-post-WPS-scan-optimization.patch
wpa/trunk/debian/patches/upstream/0033-Ignore-TX-status-for-Data-frames-from-not-associated.patch
wpa/trunk/debian/patches/upstream/0034-EAP-SIM-AKA-server-Fix-re-authentication-not-to-upda.patch
wpa/trunk/debian/patches/upstream/0035-Revert-nl80211-Fix-CONFIG_TDLS-y-build.patch
wpa/trunk/debian/patches/upstream/0036-EAP-AKA-peer-Clean-up-forgetting-id-debug-prints.patch
wpa/trunk/debian/patches/upstream/0037-EAP-AKA-peer-Append-realm-when-learning-the-pseudony.patch
wpa/trunk/debian/patches/upstream/0038-EAP-SIM-peer-Append-realm-when-learning-the-pseudony.patch
wpa/trunk/debian/patches/upstream/0039-P2P-Do-not-include-P2P-IE-in-association-request-to-.patch
wpa/trunk/debian/patches/upstream/0040-nl80211-Filter-unexpected-interface-added-up-events.patch
wpa/trunk/debian/patches/upstream/0041-Use-WPA_INTERFACE_DISABLED-with-interface-removed-ev.patch
wpa/trunk/debian/patches/upstream/0042-wext-Filter-unexpected-interface-added-up-events.patch
wpa/trunk/debian/patches/upstream/0043-dbus-Make-the-P2P-peer-s-properties-accessible-separ.patch
wpa/trunk/debian/patches/upstream/0044-dbus-utility-to-create-dbus-message-from-wpabuf-arra.patch
wpa/trunk/debian/patches/upstream/0045-dbus-revert-changes-to-some-peer-properties.patch
wpa/trunk/debian/patches/upstream/0046-dbus-return-NULL-data-for-peer-IEs.patch
wpa/trunk/debian/patches/upstream/0047-P2P-Fix-group-idle-timer-cancellation-on-group-remov.patch
wpa/trunk/debian/patches/upstream/0048-Fix-processing-of-channel-list-update-events.patch
wpa/trunk/debian/patches/upstream/0049-P2P-Skip-duplicated-provision-discovery-on-join.patch
wpa/trunk/debian/patches/upstream/0050-P2P-Fix-provisioning-info-clearing-after-successful-.patch
wpa/trunk/debian/patches/upstream/0051-P2P-Fix-remain-on-channel-use-with-PD-Invitation-Req.patch
wpa/trunk/debian/patches/upstream/0052-P2P-Make-p2p_flush-stop-P2P-operations-consistently.patch
wpa/trunk/debian/patches/upstream/0053-P2P-Fix-p2p_cancel-to-return-success-if-GO-Negotiati.patch
wpa/trunk/debian/patches/upstream/0054-Fix-memory-leak-on-parsing-multiple-network-block-ea.patch
wpa/trunk/debian/patches/upstream/0055-P2P-Filter-input-parameters-in-p2p_serv_disc_externa.patch
wpa/trunk/debian/patches/upstream/0056-TTLS-Fix-peer-challenge-generation-for-TTLS-MSCHAPv2.patch
wpa/trunk/debian/patches/upstream/0057-BSS-Fix-use-after-realloc.patch
wpa/trunk/debian/patches/upstream/0058-dbus-Make-P2P-group-properties-accessible-individual.patch
Modified: wpa/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/changelog?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/changelog (original)
+++ wpa/trunk/debian/changelog Fri Apr 13 21:36:26 2012
@@ -7,7 +7,7 @@
- hostapd: Fails to authenticate on wpa2 password (Closes: #483924)
- hostapd: EAPOL reauthentication/rekeying timeout loop when using WMM
(Closes: #655129, #659059)
- - import git patches up to hostap_0_7_2-1504-g03de63c.
+ - import git patches up to hostap_0_7_2-1519-gfee70d7.
- temporarily disable conflicting patches.
- rebase patches:
- hostap_allow-linking-with-libnl-3.2
@@ -49,7 +49,7 @@
* Remove Faidon Liambotis <paravoid at debian.org> from Uploaders as per
his request, many thanks for all past efforts Faidon.
- -- Kel Modderman <kel at otaku42.de> Mon, 09 Apr 2012 21:34:46 +1000
+ -- Stefan Lippers-Hollmann <s.l-h at gmx.de> Fri, 13 Apr 2012 23:31:25 +0200
wpasupplicant (0.7.3-6) unstable; urgency=low
Modified: wpa/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/series?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/series (original)
+++ wpa/trunk/debian/patches/series Fri Apr 13 21:36:26 2012
@@ -56,6 +56,21 @@
upstream/0056-TTLS-Fix-peer-challenge-generation-for-TTLS-MSCHAPv2.patch
upstream/0057-BSS-Fix-use-after-realloc.patch
upstream/0058-dbus-Make-P2P-group-properties-accessible-individual.patch
+upstream/0059-P2P-Validate-p2p_oper_channel-in-p2p_group_add.patch
+upstream/0060-P2P-Do-not-use-group-idle-timeout-during-provisionin.patch
+upstream/0061-Sync-with-include-linux-nl80211.h-from-wireless-test.patch
+upstream/0062-P2P-Add-support-for-preferred-channel-list.patch
+upstream/0063-Clear-previous-BSSID-on-explicit-disconnection-reque.patch
+upstream/0064-P2P-Use-P2P-Device-ID-attribute-if-Device-Info-not-a.patch
+upstream/0065-Fix-potential-double-free-and-use-of-freed-memory-in.patch
+upstream/0066-Fix-memory-leaks-on-radius_client_send-error-paths.patch
+upstream/0067-P2P-Add-deinit_p2p_cli-op-to-clear-P2P-client-driver.patch
+upstream/0068-P2P-Notify-about-disconnection-only-when-needed.patch
+upstream/0069-Change-reason-code-for-AP-mode-BSS-termination-to-3.patch
+upstream/0070-Save-bgscan-parameter-into-configuration-file.patch
+upstream/0071-Clarify-comment-in-wpa_supplicant-defconfig.patch
+upstream/0072-P2P-Fix-crash-for-failure-case-when-WSC-PIN-is-enter.patch
+upstream/0073-P2P-Disconnect-P2P-group-on-supplicant-deinit.patch
01_use_pkg-config_for_pcsc-lite_module.patch
02_dbus_group_policy.patch
Modified: wpa/trunk/debian/patches/upstream/0001-Fix-ap_sta_disconnect-to-clear-EAPOL-WPA-authenticat.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0001-Fix-ap_sta_disconnect-to-clear-EAPOL-WPA-authenticat.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0001-Fix-ap_sta_disconnect-to-clear-EAPOL-WPA-authenticat.patch (original)
+++ wpa/trunk/debian/patches/upstream/0001-Fix-ap_sta_disconnect-to-clear-EAPOL-WPA-authenticat.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 22d947a783670d30e523d07e6470e840c6541bc0 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni at qca.qualcomm.com>
Date: Wed, 25 Jan 2012 22:32:58 +0200
-Subject: [PATCH 01/58] Fix ap_sta_disconnect() to clear EAPOL/WPA
+Subject: [PATCH 01/73] Fix ap_sta_disconnect() to clear EAPOL/WPA
authenticator state
Number of places in hostapd use ap_sta_disconnect() instead of
Modified: wpa/trunk/debian/patches/upstream/0002-P2P-Fix-WSC-IE-inclusion-for-P2P-disabled-case.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0002-P2P-Fix-WSC-IE-inclusion-for-P2P-disabled-case.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0002-P2P-Fix-WSC-IE-inclusion-for-P2P-disabled-case.patch (original)
+++ wpa/trunk/debian/patches/upstream/0002-P2P-Fix-WSC-IE-inclusion-for-P2P-disabled-case.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From d34000c61fc1db6f89e9a9de7b7b6d0dffd20d2c Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni at qca.qualcomm.com>
Date: Fri, 27 Jan 2012 21:09:34 +0200
-Subject: [PATCH 02/58] P2P: Fix WSC IE inclusion for P2P disabled case
+Subject: [PATCH 02/73] P2P: Fix WSC IE inclusion for P2P disabled case
wpas_wps_in_use() was forcing WPS to be enabled unconditionally if P2P
support was included in the build. This is not really the correct
Modified: wpa/trunk/debian/patches/upstream/0003-WPS-Fix-an-interoperability-issue-with-mixed-mode-an.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0003-WPS-Fix-an-interoperability-issue-with-mixed-mode-an.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0003-WPS-Fix-an-interoperability-issue-with-mixed-mode-an.patch (original)
+++ wpa/trunk/debian/patches/upstream/0003-WPS-Fix-an-interoperability-issue-with-mixed-mode-an.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From cb57320c7ffdc1115e06b28e1028c9ec382b3e19 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni at qca.qualcomm.com>
Date: Fri, 27 Jan 2012 22:32:15 +0200
-Subject: [PATCH 03/58] WPS: Fix an interoperability issue with mixed mode and
+Subject: [PATCH 03/73] WPS: Fix an interoperability issue with mixed mode and
AP Settings
It looks like Windows 7 WPS implementation does not like multiple
Modified: wpa/trunk/debian/patches/upstream/0004-dbus-Create-DBus-getter-setter-for-FastReauth.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0004-dbus-Create-DBus-getter-setter-for-FastReauth.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0004-dbus-Create-DBus-getter-setter-for-FastReauth.patch (original)
+++ wpa/trunk/debian/patches/upstream/0004-dbus-Create-DBus-getter-setter-for-FastReauth.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 5045a668201f1027dbcc91bd8d092bbcee15a2e3 Mon Sep 17 00:00:00 2001
From: Paul Stewart <pstew at chromium.org>
Date: Sat, 28 Jan 2012 11:21:37 +0200
-Subject: [PATCH 04/58] dbus: Create DBus getter/setter for FastReauth
+Subject: [PATCH 04/73] dbus: Create DBus getter/setter for FastReauth
Provide a means over DBus to set the conf->fast_reauth
property, which controls whether TLS session resumption
Modified: wpa/trunk/debian/patches/upstream/0005-dbus-Fix-endianness-bug-in-Frequency-and-Signal-prop.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0005-dbus-Fix-endianness-bug-in-Frequency-and-Signal-prop.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0005-dbus-Fix-endianness-bug-in-Frequency-and-Signal-prop.patch (original)
+++ wpa/trunk/debian/patches/upstream/0005-dbus-Fix-endianness-bug-in-Frequency-and-Signal-prop.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 42f93a9a0f1858ba8492a1349515624965a64e34 Mon Sep 17 00:00:00 2001
From: Sylvestre Gallon <ccna.syl at gmail.com>
Date: Sat, 28 Jan 2012 17:57:48 +0200
-Subject: [PATCH 05/58] dbus: Fix endianness bug in Frequency and Signal
+Subject: [PATCH 05/73] dbus: Fix endianness bug in Frequency and Signal
properties
These properties did not work on big endian PowerPC (always 100% for
Modified: wpa/trunk/debian/patches/upstream/0006-wpa_debug-Support-outputting-hexdumps-into-syslog.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0006-wpa_debug-Support-outputting-hexdumps-into-syslog.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0006-wpa_debug-Support-outputting-hexdumps-into-syslog.patch (original)
+++ wpa/trunk/debian/patches/upstream/0006-wpa_debug-Support-outputting-hexdumps-into-syslog.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From f59767ce009d8a95f71807ca3d42fd61be7a8066 Mon Sep 17 00:00:00 2001
From: Nicolas Cavallari <Nicolas.Cavallari at lri.fr>
Date: Sun, 29 Jan 2012 12:13:43 +0200
-Subject: [PATCH 06/58] wpa_debug: Support outputting hexdumps into syslog
+Subject: [PATCH 06/73] wpa_debug: Support outputting hexdumps into syslog
This patch allows to log hexdumps into syslog.
Modified: wpa/trunk/debian/patches/upstream/0007-dbus-Remove-unused-D-Bus-version-defines.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0007-dbus-Remove-unused-D-Bus-version-defines.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0007-dbus-Remove-unused-D-Bus-version-defines.patch (original)
+++ wpa/trunk/debian/patches/upstream/0007-dbus-Remove-unused-D-Bus-version-defines.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 7efba08f36b18c07e06bafacf7f97b2bf98dd038 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j at w1.fi>
Date: Sun, 29 Jan 2012 12:53:12 +0200
-Subject: [PATCH 07/58] dbus: Remove unused D-Bus version defines
+Subject: [PATCH 07/73] dbus: Remove unused D-Bus version defines
These have not been used since commit
8ddef94bd41747ba658ed4ed5dfa9e62b4b84cfa.
Modified: wpa/trunk/debian/patches/upstream/0008-build-Fix-install-target-parent-directory-prerequisi.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0008-build-Fix-install-target-parent-directory-prerequisi.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0008-build-Fix-install-target-parent-directory-prerequisi.patch (original)
+++ wpa/trunk/debian/patches/upstream/0008-build-Fix-install-target-parent-directory-prerequisi.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 2c8924e2ad63f27a677f6366054f61496fbd992d Mon Sep 17 00:00:00 2001
From: Grant Erickson <marathon96 at gmail.com>
Date: Sun, 29 Jan 2012 14:18:22 +0200
-Subject: [PATCH 08/58] build: Fix install target parent directory
+Subject: [PATCH 08/73] build: Fix install target parent directory
prerequisites
This changes the install target such that parent directories of
Modified: wpa/trunk/debian/patches/upstream/0009-Install-only-the-binaries-into-BINDIR.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0009-Install-only-the-binaries-into-BINDIR.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0009-Install-only-the-binaries-into-BINDIR.patch (original)
+++ wpa/trunk/debian/patches/upstream/0009-Install-only-the-binaries-into-BINDIR.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 8dee7fb2a435b2b6f5d452bd7a7bb30f3f3ccef0 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j at w1.fi>
Date: Sun, 29 Jan 2012 14:20:41 +0200
-Subject: [PATCH 09/58] Install only the binaries into BINDIR
+Subject: [PATCH 09/73] Install only the binaries into BINDIR
There is no point in installing *.service files into BINDIR.
Modified: wpa/trunk/debian/patches/upstream/0010-SME-Fix-processing-of-Authentication-timeout-and-fai.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0010-SME-Fix-processing-of-Authentication-timeout-and-fai.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0010-SME-Fix-processing-of-Authentication-timeout-and-fai.patch (original)
+++ wpa/trunk/debian/patches/upstream/0010-SME-Fix-processing-of-Authentication-timeout-and-fai.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From bcc8fb87aac9b5ffd5f9d09da606d3847ea39223 Mon Sep 17 00:00:00 2001
From: Eyal Shapira <eyal at wizery.com>
Date: Sun, 29 Jan 2012 17:44:31 +0200
-Subject: [PATCH 10/58] SME: Fix processing of Authentication timeout and
+Subject: [PATCH 10/73] SME: Fix processing of Authentication timeout and
failure
current_bss and pending_bssid weren't cleaned up so BSS
Modified: wpa/trunk/debian/patches/upstream/0011-WPS-Disable-AP-PIN-after-10-consecutive-failures.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0011-WPS-Disable-AP-PIN-after-10-consecutive-failures.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0011-WPS-Disable-AP-PIN-after-10-consecutive-failures.patch (original)
+++ wpa/trunk/debian/patches/upstream/0011-WPS-Disable-AP-PIN-after-10-consecutive-failures.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 17b627e29b9f718a074781efc77323f38b52ab36 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni at qca.qualcomm.com>
Date: Mon, 30 Jan 2012 17:31:06 +0200
-Subject: [PATCH 11/58] WPS: Disable AP PIN after 10 consecutive failures
+Subject: [PATCH 11/73] WPS: Disable AP PIN after 10 consecutive failures
While the exponential increase in the lockout period provides an
efficient mitigation mechanism against brute force attacks, this
Modified: wpa/trunk/debian/patches/upstream/0012-Interworking-Fix-EAP-TTLS-MSCHAP-configuration.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0012-Interworking-Fix-EAP-TTLS-MSCHAP-configuration.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0012-Interworking-Fix-EAP-TTLS-MSCHAP-configuration.patch (original)
+++ wpa/trunk/debian/patches/upstream/0012-Interworking-Fix-EAP-TTLS-MSCHAP-configuration.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 4e6bdb158cb2e7d600c7e1aea8dd999f0d096016 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni at qca.qualcomm.com>
Date: Tue, 31 Jan 2012 16:20:43 +0200
-Subject: [PATCH 12/58] Interworking: Fix EAP-TTLS/MSCHAP configuration
+Subject: [PATCH 12/73] Interworking: Fix EAP-TTLS/MSCHAP configuration
Copy-paste error ended up using CHAP when MSCHAP was supposed to be
set.
Modified: wpa/trunk/debian/patches/upstream/0013-Clear-EAPOL-authenticator-authFail-for-PMKSA-caching.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0013-Clear-EAPOL-authenticator-authFail-for-PMKSA-caching.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0013-Clear-EAPOL-authenticator-authFail-for-PMKSA-caching.patch (original)
+++ wpa/trunk/debian/patches/upstream/0013-Clear-EAPOL-authenticator-authFail-for-PMKSA-caching.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From d5edac1c49e09e84fa22fa9522a988d40e7c3943 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j at w1.fi>
Date: Sat, 4 Feb 2012 12:21:42 +0200
-Subject: [PATCH 13/58] Clear EAPOL authenticator authFail for PMKSA
+Subject: [PATCH 13/73] Clear EAPOL authenticator authFail for PMKSA
caching/FT
This fixes a corner case where a STA that has PMKSA cache entry (or
Modified: wpa/trunk/debian/patches/upstream/0014-Delay-scan-request-on-select_network-if-disconnectin.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0014-Delay-scan-request-on-select_network-if-disconnectin.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0014-Delay-scan-request-on-select_network-if-disconnectin.patch (original)
+++ wpa/trunk/debian/patches/upstream/0014-Delay-scan-request-on-select_network-if-disconnectin.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 92dc94ea8a2c5bb08447c25b76c863d6483eda6d Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j at w1.fi>
Date: Sat, 4 Feb 2012 12:28:16 +0200
-Subject: [PATCH 14/58] Delay scan request on select_network if disconnecting
+Subject: [PATCH 14/73] Delay scan request on select_network if disconnecting
The disconnection command results in disassociation and deauthentication
events which were previously processed during the scan in case of
Modified: wpa/trunk/debian/patches/upstream/0015-P2P-Fix-DBus-crash-and-return-additional-P2P-group-p.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0015-P2P-Fix-DBus-crash-and-return-additional-P2P-group-p.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0015-P2P-Fix-DBus-crash-and-return-additional-P2P-group-p.patch (original)
+++ wpa/trunk/debian/patches/upstream/0015-P2P-Fix-DBus-crash-and-return-additional-P2P-group-p.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From da8ca695fc5a1e38e69d5fb65e9863a0a10a4704 Mon Sep 17 00:00:00 2001
From: Todd Previte <toddx.a.previte at intel.com>
Date: Sat, 4 Feb 2012 13:08:12 +0200
-Subject: [PATCH 15/58] P2P: Fix DBus crash and return additional P2P group
+Subject: [PATCH 15/73] P2P: Fix DBus crash and return additional P2P group
properties
When using DBus to get group properties, a segmentation fault is
Modified: wpa/trunk/debian/patches/upstream/0016-P2P-Fix-the-setter-function-for-DBus-group-propertie.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0016-P2P-Fix-the-setter-function-for-DBus-group-propertie.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0016-P2P-Fix-the-setter-function-for-DBus-group-propertie.patch (original)
+++ wpa/trunk/debian/patches/upstream/0016-P2P-Fix-the-setter-function-for-DBus-group-propertie.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 24f1cf70b1e063b3a92ff40013818157f8ce6d4c Mon Sep 17 00:00:00 2001
From: Todd Previte <toddx.a.previte at intel.com>
Date: Sat, 4 Feb 2012 13:13:59 +0200
-Subject: [PATCH 16/58] P2P: Fix the setter function for DBus group properties
+Subject: [PATCH 16/73] P2P: Fix the setter function for DBus group properties
The setter function uses the same hostapd_data structure as the getter
which causes it to crash if called on a P2P client. To overcome this
Modified: wpa/trunk/debian/patches/upstream/0017-Try-fallback-drivers-if-global-init-for-preferred-dr.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0017-Try-fallback-drivers-if-global-init-for-preferred-dr.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0017-Try-fallback-drivers-if-global-init-for-preferred-dr.patch (original)
+++ wpa/trunk/debian/patches/upstream/0017-Try-fallback-drivers-if-global-init-for-preferred-dr.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From ba53656e8224cac7bd824673f785f66812460afa Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw at redhat.com>
Date: Sat, 4 Feb 2012 20:09:00 +0200
-Subject: [PATCH 17/58] Try fallback drivers if global init for preferred
+Subject: [PATCH 17/73] Try fallback drivers if global init for preferred
drivers fails
Driver global init was considered a hard failure. Thus if, for example,
Modified: wpa/trunk/debian/patches/upstream/0018-P2P-Remove-unneeded-go_neg_peer-check-from-PD.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0018-P2P-Remove-unneeded-go_neg_peer-check-from-PD.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0018-P2P-Remove-unneeded-go_neg_peer-check-from-PD.patch (original)
+++ wpa/trunk/debian/patches/upstream/0018-P2P-Remove-unneeded-go_neg_peer-check-from-PD.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 4027891cf0b6f6bc16d55d37fa87e5d309fa8fcf Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg at intel.com>
Date: Sun, 5 Feb 2012 19:05:45 +0200
-Subject: [PATCH 18/58] P2P: Remove unneeded go_neg_peer check from PD
+Subject: [PATCH 18/73] P2P: Remove unneeded go_neg_peer check from PD
When the GO negotiation peer is assigned, the state also cannot be IDLE,
SEARCH, or LISTEN_ONLY.
Modified: wpa/trunk/debian/patches/upstream/0019-P2P-Skip-event-notification-on-PD-Response-in-join-g.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0019-P2P-Skip-event-notification-on-PD-Response-in-join-g.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0019-P2P-Skip-event-notification-on-PD-Response-in-join-g.patch (original)
+++ wpa/trunk/debian/patches/upstream/0019-P2P-Skip-event-notification-on-PD-Response-in-join-g.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From f7356eced71a1884b510f8da642928f20fa3543d Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j at w1.fi>
Date: Sun, 5 Feb 2012 20:20:36 +0200
-Subject: [PATCH 19/58] P2P: Skip event notification on PD Response in
+Subject: [PATCH 19/73] P2P: Skip event notification on PD Response in
join-group case
Provision Discovery is used as a notification to the GO in the case we
Modified: wpa/trunk/debian/patches/upstream/0020-P2P-Wait-for-PD-before-join-response.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0020-P2P-Wait-for-PD-before-join-response.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0020-P2P-Wait-for-PD-before-join-response.patch (original)
+++ wpa/trunk/debian/patches/upstream/0020-P2P-Wait-for-PD-before-join-response.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 7d35098683fb27dd38cc842a87536b8d17009c5f Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j at w1.fi>
Date: Sun, 5 Feb 2012 20:52:24 +0200
-Subject: [PATCH 20/58] P2P: Wait for PD-before-join response
+Subject: [PATCH 20/73] P2P: Wait for PD-before-join response
Even though the Provision Discovery Response frame from PD-before-join
does not really provide any additional information, it can be better to
Modified: wpa/trunk/debian/patches/upstream/0021-Move-AP-events-for-STA-connected-disconnected-into-o.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0021-Move-AP-events-for-STA-connected-disconnected-into-o.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0021-Move-AP-events-for-STA-connected-disconnected-into-o.patch (original)
+++ wpa/trunk/debian/patches/upstream/0021-Move-AP-events-for-STA-connected-disconnected-into-o.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From b3aff8e089006a62f0bffd361def8f5008bc75e1 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j at w1.fi>
Date: Thu, 3 Nov 2011 22:17:41 +0200
-Subject: [PATCH 21/58] Move AP events for STA connected/disconnected into one
+Subject: [PATCH 21/73] Move AP events for STA connected/disconnected into one
function
Instead of trying to remember to add wpa_msg() calls for every possible
Modified: wpa/trunk/debian/patches/upstream/0022-P2P-Send-STA-connected-disconnected-events-to-parent.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0022-P2P-Send-STA-connected-disconnected-events-to-parent.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0022-P2P-Send-STA-connected-disconnected-events-to-parent.patch (original)
+++ wpa/trunk/debian/patches/upstream/0022-P2P-Send-STA-connected-disconnected-events-to-parent.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 69047431ec2ea167e130d3e93b0a0bae505fdcf4 Mon Sep 17 00:00:00 2001
From: Dmitry Shmidt <dimitrysh at google.com>
Date: Thu, 21 Jul 2011 15:19:46 -0700
-Subject: [PATCH 22/58] P2P: Send STA connected/disconnected events to parent
+Subject: [PATCH 22/73] P2P: Send STA connected/disconnected events to parent
ctrl_iface
Send the connection events from P2P group to both the group interface
Modified: wpa/trunk/debian/patches/upstream/0023-P2P-Append-P2P-Device-Address-to-AP-STA-DISCONNECTED.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0023-P2P-Append-P2P-Device-Address-to-AP-STA-DISCONNECTED.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0023-P2P-Append-P2P-Device-Address-to-AP-STA-DISCONNECTED.patch (original)
+++ wpa/trunk/debian/patches/upstream/0023-P2P-Append-P2P-Device-Address-to-AP-STA-DISCONNECTED.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From b05861bbd526830f586cc8e86dc2ab5e8651db04 Mon Sep 17 00:00:00 2001
From: Jithu Jance <jithu at broadcom.com>
Date: Sat, 10 Dec 2011 12:26:00 +0200
-Subject: [PATCH 23/58] P2P: Append P2P Device Address to AP-STA-DISCONNECTED
+Subject: [PATCH 23/73] P2P: Append P2P Device Address to AP-STA-DISCONNECTED
event
Append "p2p_dev_addr" parameter to AP-STA-DISCONNECTED event for P2P
Modified: wpa/trunk/debian/patches/upstream/0024-P2P-Maintain-a-list-of-P2P-Clients-for-persistent-gr.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0024-P2P-Maintain-a-list-of-P2P-Clients-for-persistent-gr.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0024-P2P-Maintain-a-list-of-P2P-Clients-for-persistent-gr.patch (original)
+++ wpa/trunk/debian/patches/upstream/0024-P2P-Maintain-a-list-of-P2P-Clients-for-persistent-gr.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 2db9ac2173a89de4af2be8c01206ecd0bf26695b Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j at w1.fi>
Date: Thu, 22 Dec 2011 22:47:41 +0200
-Subject: [PATCH 24/58] P2P: Maintain a list of P2P Clients for persistent
+Subject: [PATCH 24/73] P2P: Maintain a list of P2P Clients for persistent
group on GO
Add a new persistent group network block field, p2p_client_list, to
Modified: wpa/trunk/debian/patches/upstream/0025-P2P-Set-Invitation-Type-to-1-for-GO-inviting-to-a-pe.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0025-P2P-Set-Invitation-Type-to-1-for-GO-inviting-to-a-pe.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0025-P2P-Set-Invitation-Type-to-1-for-GO-inviting-to-a-pe.patch (original)
+++ wpa/trunk/debian/patches/upstream/0025-P2P-Set-Invitation-Type-to-1-for-GO-inviting-to-a-pe.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 61d96aecb052746ee51bb4b6d22c89ff7078cbf3 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j at w1.fi>
Date: Mon, 6 Feb 2012 21:54:36 +0200
-Subject: [PATCH 25/58] P2P: Set Invitation Type to 1 for GO inviting to a
+Subject: [PATCH 25/73] P2P: Set Invitation Type to 1 for GO inviting to a
persistent group
When a GO is operating a persistent group and invites a peer that has
Modified: wpa/trunk/debian/patches/upstream/0026-P2P-Allow-BSS-entry-to-be-fetched-based-on-GO-P2P-De.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0026-P2P-Allow-BSS-entry-to-be-fetched-based-on-GO-P2P-De.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0026-P2P-Allow-BSS-entry-to-be-fetched-based-on-GO-P2P-De.patch (original)
+++ wpa/trunk/debian/patches/upstream/0026-P2P-Allow-BSS-entry-to-be-fetched-based-on-GO-P2P-De.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 0a00a7df4b75324b0b60bd08bee1580e373e029c Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni at qca.qualcomm.com>
Date: Tue, 7 Feb 2012 16:23:21 +0200
-Subject: [PATCH 26/58] P2P: Allow BSS entry to be fetched based on GO P2P
+Subject: [PATCH 26/73] P2P: Allow BSS entry to be fetched based on GO P2P
Device Address
"BSS p2p_dev_addr=<P2P Device Address>" can now be used to fetch a
Modified: wpa/trunk/debian/patches/upstream/0027-P2P-Move-p2p_add_device-prototype-to-correct-header-.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0027-P2P-Move-p2p_add_device-prototype-to-correct-header-.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0027-P2P-Move-p2p_add_device-prototype-to-correct-header-.patch (original)
+++ wpa/trunk/debian/patches/upstream/0027-P2P-Move-p2p_add_device-prototype-to-correct-header-.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 08b15c826f3bd3000cfb649ac14d2c76703a5224 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni at qca.qualcomm.com>
Date: Tue, 7 Feb 2012 16:26:20 +0200
-Subject: [PATCH 27/58] P2P: Move p2p_add_device() prototype to correct header
+Subject: [PATCH 27/73] P2P: Move p2p_add_device() prototype to correct header
file
This was supposed to be an internal API to be used only within
Modified: wpa/trunk/debian/patches/upstream/0028-P2P-Fix-p2p_scan-error-processing-in-p2p_search.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0028-P2P-Fix-p2p_scan-error-processing-in-p2p_search.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0028-P2P-Fix-p2p_scan-error-processing-in-p2p_search.patch (original)
+++ wpa/trunk/debian/patches/upstream/0028-P2P-Fix-p2p_scan-error-processing-in-p2p_search.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 495cce1dd91562964d6ececcb70e0c95f76581d3 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni at qca.qualcomm.com>
Date: Thu, 9 Feb 2012 12:46:44 +0200
-Subject: [PATCH 28/58] P2P: Fix p2p_scan() error processing in p2p_search()
+Subject: [PATCH 28/73] P2P: Fix p2p_scan() error processing in p2p_search()
Commit 39185dfa549f076a6be114e0149a3649d302f477 changed the p2p_scan()
callback to return 1 in some cases, but forgot to change this p2p_scan()
Modified: wpa/trunk/debian/patches/upstream/0029-P2P-Avoid-re-starting-p2p_search-in-some-corner-case.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0029-P2P-Avoid-re-starting-p2p_search-in-some-corner-case.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0029-P2P-Avoid-re-starting-p2p_search-in-some-corner-case.patch (original)
+++ wpa/trunk/debian/patches/upstream/0029-P2P-Avoid-re-starting-p2p_search-in-some-corner-case.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From e177415c1932604ef6d5e64ce63294f85ae49417 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni at qca.qualcomm.com>
Date: Thu, 9 Feb 2012 12:49:36 +0200
-Subject: [PATCH 29/58] P2P: Avoid re-starting p2p_search in some corner cases
+Subject: [PATCH 29/73] P2P: Avoid re-starting p2p_search in some corner cases
Search (p2p_scan) could already have been started at the point
remain-on-channel end event is being processed, e.g., if an Action frame
Modified: wpa/trunk/debian/patches/upstream/0030-P2P-Do-not-expire-GO-peer-entry-during-group-rekeyin.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0030-P2P-Do-not-expire-GO-peer-entry-during-group-rekeyin.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0030-P2P-Do-not-expire-GO-peer-entry-during-group-rekeyin.patch (original)
+++ wpa/trunk/debian/patches/upstream/0030-P2P-Do-not-expire-GO-peer-entry-during-group-rekeyin.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 9c8db36f9ff056dbc33a33ef836442e13ac8c9b3 Mon Sep 17 00:00:00 2001
From: Piotr Nakraszewicz <Piotr.Nakraszewicz at tieto.com>
Date: Sat, 11 Feb 2012 10:54:40 +0200
-Subject: [PATCH 30/58] P2P: Do not expire GO peer entry during group rekeying
+Subject: [PATCH 30/73] P2P: Do not expire GO peer entry during group rekeying
If wpas_go_connected() is called during group rekeying the P2P GO peer
will expire. To prevent that check if group rekeying is not in progress.
Modified: wpa/trunk/debian/patches/upstream/0031-EAP-pwd-Describe-build-option-for-EAP-pwd.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0031-EAP-pwd-Describe-build-option-for-EAP-pwd.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0031-EAP-pwd-Describe-build-option-for-EAP-pwd.patch (original)
+++ wpa/trunk/debian/patches/upstream/0031-EAP-pwd-Describe-build-option-for-EAP-pwd.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 13f58940d587b74941c956456e500e18fffc980d Mon Sep 17 00:00:00 2001
From: Dan Harkins <dharkins at lounge.org>
Date: Sat, 11 Feb 2012 12:17:58 +0200
-Subject: [PATCH 31/58] EAP-pwd: Describe build option for EAP-pwd
+Subject: [PATCH 31/73] EAP-pwd: Describe build option for EAP-pwd
Signed-hostap: Dan Harkins <dharkins at lounge.org>
(cherry picked from commit 27c9d333d4bfab2b3ac377e5a7920e14a0fc6fe9)
Modified: wpa/trunk/debian/patches/upstream/0032-WPS-Fix-regression-in-post-WPS-scan-optimization.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0032-WPS-Fix-regression-in-post-WPS-scan-optimization.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0032-WPS-Fix-regression-in-post-WPS-scan-optimization.patch (original)
+++ wpa/trunk/debian/patches/upstream/0032-WPS-Fix-regression-in-post-WPS-scan-optimization.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 4a7f260a0d2b9c9e9033063cdaa437866aedd7dd Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j at w1.fi>
Date: Sun, 12 Feb 2012 13:54:15 +0200
-Subject: [PATCH 32/58] WPS: Fix regression in post-WPS scan optimization
+Subject: [PATCH 32/73] WPS: Fix regression in post-WPS scan optimization
Commit 3c85f144ce7aa3967f881a7584a5b125061ca436 fixed issues with P2P
Action frame TX after disconnection by clearing wpa_s->assoc_freq.
Modified: wpa/trunk/debian/patches/upstream/0033-Ignore-TX-status-for-Data-frames-from-not-associated.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0033-Ignore-TX-status-for-Data-frames-from-not-associated.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0033-Ignore-TX-status-for-Data-frames-from-not-associated.patch (original)
+++ wpa/trunk/debian/patches/upstream/0033-Ignore-TX-status-for-Data-frames-from-not-associated.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 962ef491651039341583877e191ef920173d3f4c Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j at w1.fi>
Date: Tue, 14 Feb 2012 21:04:14 +0200
-Subject: [PATCH 33/58] Ignore TX status for Data frames from not associated
+Subject: [PATCH 33/73] Ignore TX status for Data frames from not associated
STA
Commit d9a38716ccf90b0ab307f570a30931684a1b8730 did this for
Modified: wpa/trunk/debian/patches/upstream/0034-EAP-SIM-AKA-server-Fix-re-authentication-not-to-upda.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0034-EAP-SIM-AKA-server-Fix-re-authentication-not-to-upda.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0034-EAP-SIM-AKA-server-Fix-re-authentication-not-to-upda.patch (original)
+++ wpa/trunk/debian/patches/upstream/0034-EAP-SIM-AKA-server-Fix-re-authentication-not-to-upda.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 1f5b37fd49a6883309b2d80ea3af5528aa9162bc Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j at w1.fi>
Date: Thu, 16 Feb 2012 23:27:01 +0200
-Subject: [PATCH 34/58] EAP-SIM/AKA server: Fix re-authentication not to
+Subject: [PATCH 34/73] EAP-SIM/AKA server: Fix re-authentication not to
update pseudonym
AT_NEXT_PSEUDONYM is supposed to be included only in the Challenge
Modified: wpa/trunk/debian/patches/upstream/0035-Revert-nl80211-Fix-CONFIG_TDLS-y-build.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0035-Revert-nl80211-Fix-CONFIG_TDLS-y-build.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0035-Revert-nl80211-Fix-CONFIG_TDLS-y-build.patch (original)
+++ wpa/trunk/debian/patches/upstream/0035-Revert-nl80211-Fix-CONFIG_TDLS-y-build.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 1d931b280127317a8b3513d380f772867eda0ca9 Mon Sep 17 00:00:00 2001
From: Angie Chinchilla <angie.v.chinchilla at intel.com>
Date: Tue, 21 Feb 2012 13:29:38 -0800
-Subject: [PATCH 35/58] Revert "nl80211: Fix CONFIG_TDLS=y build"
+Subject: [PATCH 35/73] Revert "nl80211: Fix CONFIG_TDLS=y build"
This reverts commit f75709d115185c4162e29ab73c0a9420e43d3893.
This should not have picked up due to missing dependent code in
Modified: wpa/trunk/debian/patches/upstream/0036-EAP-AKA-peer-Clean-up-forgetting-id-debug-prints.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0036-EAP-AKA-peer-Clean-up-forgetting-id-debug-prints.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0036-EAP-AKA-peer-Clean-up-forgetting-id-debug-prints.patch (original)
+++ wpa/trunk/debian/patches/upstream/0036-EAP-AKA-peer-Clean-up-forgetting-id-debug-prints.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 567d14fb23e3e40561f6ce791d6e3a330eb49985 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j at w1.fi>
Date: Thu, 16 Feb 2012 23:25:53 +0200
-Subject: [PATCH 36/58] EAP-AKA peer: Clean up forgetting-id debug prints
+Subject: [PATCH 36/73] EAP-AKA peer: Clean up forgetting-id debug prints
Do not show forgetting of old id values if no value was stored.
Modified: wpa/trunk/debian/patches/upstream/0037-EAP-AKA-peer-Append-realm-when-learning-the-pseudony.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0037-EAP-AKA-peer-Append-realm-when-learning-the-pseudony.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0037-EAP-AKA-peer-Append-realm-when-learning-the-pseudony.patch (original)
+++ wpa/trunk/debian/patches/upstream/0037-EAP-AKA-peer-Append-realm-when-learning-the-pseudony.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 0d461293a957bd86f2b722e30541cd55cb5301f6 Mon Sep 17 00:00:00 2001
From: Simon Baatz <gmbnomis at gmail.com>
Date: Sat, 28 Jan 2012 19:41:19 +0200
-Subject: [PATCH 37/58] EAP-AKA peer: Append realm when learning the pseudonym
+Subject: [PATCH 37/73] EAP-AKA peer: Append realm when learning the pseudonym
The pseudonym identity should use a realm in environments where a realm is
used. Thus, the realm of the permanent identity is added to the pseudonym
Modified: wpa/trunk/debian/patches/upstream/0038-EAP-SIM-peer-Append-realm-when-learning-the-pseudony.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0038-EAP-SIM-peer-Append-realm-when-learning-the-pseudony.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0038-EAP-SIM-peer-Append-realm-when-learning-the-pseudony.patch (original)
+++ wpa/trunk/debian/patches/upstream/0038-EAP-SIM-peer-Append-realm-when-learning-the-pseudony.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From e08d4320ca88464e126b219a3a2dfc690ffdf837 Mon Sep 17 00:00:00 2001
From: Simon Baatz <gmbnomis at gmail.com>
Date: Sat, 28 Jan 2012 19:38:46 +0200
-Subject: [PATCH 38/58] EAP-SIM peer: Append realm when learning the pseudonym
+Subject: [PATCH 38/73] EAP-SIM peer: Append realm when learning the pseudonym
The pseudonym identity should use a realm in environments where a realm is
used. Thus, the realm of the permanent identity is added to the pseudonym
Modified: wpa/trunk/debian/patches/upstream/0039-P2P-Do-not-include-P2P-IE-in-association-request-to-.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0039-P2P-Do-not-include-P2P-IE-in-association-request-to-.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0039-P2P-Do-not-include-P2P-IE-in-association-request-to-.patch (original)
+++ wpa/trunk/debian/patches/upstream/0039-P2P-Do-not-include-P2P-IE-in-association-request-to-.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From fdfee3fc154f36b6015e4aba1dbf3f886e5297c4 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni at qca.qualcomm.com>
Date: Fri, 17 Feb 2012 11:34:56 +0200
-Subject: [PATCH 39/58] P2P: Do not include P2P IE in association request to
+Subject: [PATCH 39/73] P2P: Do not include P2P IE in association request to
non-P2P AP
This was previously fixed for most cases in commit
Modified: wpa/trunk/debian/patches/upstream/0040-nl80211-Filter-unexpected-interface-added-up-events.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0040-nl80211-Filter-unexpected-interface-added-up-events.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0040-nl80211-Filter-unexpected-interface-added-up-events.patch (original)
+++ wpa/trunk/debian/patches/upstream/0040-nl80211-Filter-unexpected-interface-added-up-events.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From f84a6203700c2600f60819ad6aad678e042d1c04 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j at w1.fi>
Date: Sat, 18 Feb 2012 13:13:23 +0200
-Subject: [PATCH 40/58] nl80211: Filter unexpected interface added/up events
+Subject: [PATCH 40/73] nl80211: Filter unexpected interface added/up events
It looks like a RTM_NEWLINK event claiming the interface to be UP is
delivered just before removing an interface after having first indicated
Modified: wpa/trunk/debian/patches/upstream/0041-Use-WPA_INTERFACE_DISABLED-with-interface-removed-ev.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0041-Use-WPA_INTERFACE_DISABLED-with-interface-removed-ev.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0041-Use-WPA_INTERFACE_DISABLED-with-interface-removed-ev.patch (original)
+++ wpa/trunk/debian/patches/upstream/0041-Use-WPA_INTERFACE_DISABLED-with-interface-removed-ev.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From dcae1bb2071378eeade704295a4488a8edd03b2a Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j at w1.fi>
Date: Sat, 18 Feb 2012 13:16:17 +0200
-Subject: [PATCH 41/58] Use WPA_INTERFACE_DISABLED with interface removed
+Subject: [PATCH 41/73] Use WPA_INTERFACE_DISABLED with interface removed
events
This makes WPA_INTERFACE_DISABLED more consistent in indicating that
Modified: wpa/trunk/debian/patches/upstream/0042-wext-Filter-unexpected-interface-added-up-events.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0042-wext-Filter-unexpected-interface-added-up-events.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0042-wext-Filter-unexpected-interface-added-up-events.patch (original)
+++ wpa/trunk/debian/patches/upstream/0042-wext-Filter-unexpected-interface-added-up-events.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 6180e2d444d1d5b81ee45a35180c9d4449237b07 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j at w1.fi>
Date: Sat, 18 Feb 2012 13:28:21 +0200
-Subject: [PATCH 42/58] wext: Filter unexpected interface added/up events
+Subject: [PATCH 42/73] wext: Filter unexpected interface added/up events
It looks like a RTM_NEWLINK event claiming the interface to be UP is
delivered just before removing an interface after having first indicated
Modified: wpa/trunk/debian/patches/upstream/0043-dbus-Make-the-P2P-peer-s-properties-accessible-separ.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0043-dbus-Make-the-P2P-peer-s-properties-accessible-separ.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0043-dbus-Make-the-P2P-peer-s-properties-accessible-separ.patch (original)
+++ wpa/trunk/debian/patches/upstream/0043-dbus-Make-the-P2P-peer-s-properties-accessible-separ.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 49b1bce614776e4d1813a41e26a94c9fbf9b84db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fl=C3=A1vio=20Ceolin?= <flavio.ceolin at profusion.mobi>
Date: Sat, 11 Feb 2012 11:36:50 +0200
-Subject: [PATCH 43/58] dbus: Make the P2P peer's properties accessible
+Subject: [PATCH 43/73] dbus: Make the P2P peer's properties accessible
separately
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Modified: wpa/trunk/debian/patches/upstream/0044-dbus-utility-to-create-dbus-message-from-wpabuf-arra.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0044-dbus-utility-to-create-dbus-message-from-wpabuf-arra.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0044-dbus-utility-to-create-dbus-message-from-wpabuf-arra.patch (original)
+++ wpa/trunk/debian/patches/upstream/0044-dbus-utility-to-create-dbus-message-from-wpabuf-arra.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From db4b7c8db78d7e4f6ba1ee84bc470a8256854ed8 Mon Sep 17 00:00:00 2001
From: Jayant Sane <jayant.sane at intel.com>
Date: Sat, 25 Feb 2012 10:45:17 +0200
-Subject: [PATCH 44/58] dbus: utility to create dbus message from wpabuf array
+Subject: [PATCH 44/73] dbus: utility to create dbus message from wpabuf array
If a wpabuf array is used to store basic typed data that we would like
to send over D-Bus then this utility will be of help when it places the
Modified: wpa/trunk/debian/patches/upstream/0045-dbus-revert-changes-to-some-peer-properties.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0045-dbus-revert-changes-to-some-peer-properties.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0045-dbus-revert-changes-to-some-peer-properties.patch (original)
+++ wpa/trunk/debian/patches/upstream/0045-dbus-revert-changes-to-some-peer-properties.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 3d8748b1789531e58212390206ed64dc7040fc8c Mon Sep 17 00:00:00 2001
From: Reinette Chatre <reinette.chatre at intel.com>
Date: Sat, 25 Feb 2012 10:50:13 +0200
-Subject: [PATCH 45/58] dbus: revert changes to some peer properties
+Subject: [PATCH 45/73] dbus: revert changes to some peer properties
Commit 3f6e50ac282bbcb4be137023316543bd232ba350 made it possible to access
P2P peer properties using the org.freedesktop.DBus.Properties interface.
Modified: wpa/trunk/debian/patches/upstream/0046-dbus-return-NULL-data-for-peer-IEs.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0046-dbus-return-NULL-data-for-peer-IEs.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0046-dbus-return-NULL-data-for-peer-IEs.patch (original)
+++ wpa/trunk/debian/patches/upstream/0046-dbus-return-NULL-data-for-peer-IEs.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 717ee459a4d08b2b68b1ad22a62403a567ca3b0d Mon Sep 17 00:00:00 2001
From: Reinette Chatre <reinette.chatre at intel.com>
Date: Sat, 25 Feb 2012 10:54:11 +0200
-Subject: [PATCH 46/58] dbus: return NULL data for peer IEs
+Subject: [PATCH 46/73] dbus: return NULL data for peer IEs
The org.freedesktop.DBus.Properties interface is now supported for peer
properties. Ensure that GetAll will work by having the IEs property
Modified: wpa/trunk/debian/patches/upstream/0047-P2P-Fix-group-idle-timer-cancellation-on-group-remov.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0047-P2P-Fix-group-idle-timer-cancellation-on-group-remov.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0047-P2P-Fix-group-idle-timer-cancellation-on-group-remov.patch (original)
+++ wpa/trunk/debian/patches/upstream/0047-P2P-Fix-group-idle-timer-cancellation-on-group-remov.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 791e6df3dfb605acda94732eb35214d818c4f68d Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni at qca.qualcomm.com>
Date: Sun, 19 Feb 2012 18:10:20 +0200
-Subject: [PATCH 47/58] P2P: Fix group idle timer cancellation on group
+Subject: [PATCH 47/73] P2P: Fix group idle timer cancellation on group
removal
The wpas_p2p_group_idle_timeout was getting cancelled in the beginning
Modified: wpa/trunk/debian/patches/upstream/0048-Fix-processing-of-channel-list-update-events.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0048-Fix-processing-of-channel-list-update-events.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0048-Fix-processing-of-channel-list-update-events.patch (original)
+++ wpa/trunk/debian/patches/upstream/0048-Fix-processing-of-channel-list-update-events.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 449185b0e6d45fdb27537c4b9be5a4f52d5cf29a Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni at qca.qualcomm.com>
Date: Thu, 1 Mar 2012 17:53:53 +0200
-Subject: [PATCH 48/58] Fix processing of channel list update events
+Subject: [PATCH 48/73] Fix processing of channel list update events
Commit 6bf731e8cea4d9d41665d271b331e096c7c569e9 broke handling of
EVENT_CHANNEL_LIST_CHANGED by introducing a cached copy of the driver
Modified: wpa/trunk/debian/patches/upstream/0049-P2P-Skip-duplicated-provision-discovery-on-join.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0049-P2P-Skip-duplicated-provision-discovery-on-join.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0049-P2P-Skip-duplicated-provision-discovery-on-join.patch (original)
+++ wpa/trunk/debian/patches/upstream/0049-P2P-Skip-duplicated-provision-discovery-on-join.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 8a5a27b668a14ae4a3b9ddef4196be4eff9193f0 Mon Sep 17 00:00:00 2001
From: Jithu Jance <jithu at broadcom.com>
Date: Tue, 6 Dec 2011 21:44:57 +0200
-Subject: [PATCH 49/58] P2P: Skip duplicated provision discovery on join
+Subject: [PATCH 49/73] P2P: Skip duplicated provision discovery on join
If p2p_prov_disc join command is used prior to p2p_connect join,
skip the duplicated provision discovery exchange.
Modified: wpa/trunk/debian/patches/upstream/0050-P2P-Fix-provisioning-info-clearing-after-successful-.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0050-P2P-Fix-provisioning-info-clearing-after-successful-.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0050-P2P-Fix-provisioning-info-clearing-after-successful-.patch (original)
+++ wpa/trunk/debian/patches/upstream/0050-P2P-Fix-provisioning-info-clearing-after-successful-.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From b9ec7f810c93418171e370ed30b453a45b0dcde7 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni at qca.qualcomm.com>
Date: Thu, 1 Mar 2012 22:06:03 +0200
-Subject: [PATCH 50/58] P2P: Fix provisioning info clearing after successful
+Subject: [PATCH 50/73] P2P: Fix provisioning info clearing after successful
WPS step
Previously, this provisioning info was cleared using the P2P Interface
Modified: wpa/trunk/debian/patches/upstream/0051-P2P-Fix-remain-on-channel-use-with-PD-Invitation-Req.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0051-P2P-Fix-remain-on-channel-use-with-PD-Invitation-Req.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0051-P2P-Fix-remain-on-channel-use-with-PD-Invitation-Req.patch (original)
+++ wpa/trunk/debian/patches/upstream/0051-P2P-Fix-remain-on-channel-use-with-PD-Invitation-Req.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 5aa5c1b8c9a96a3c01768740d31b54d0634e4392 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni at qca.qualcomm.com>
Date: Mon, 27 Feb 2012 17:23:41 +0200
-Subject: [PATCH 51/58] P2P: Fix remain-on-channel use with PD/Invitation
+Subject: [PATCH 51/73] P2P: Fix remain-on-channel use with PD/Invitation
Request while in Listen
If Listen state was in progress on another channel when a request to
Modified: wpa/trunk/debian/patches/upstream/0052-P2P-Make-p2p_flush-stop-P2P-operations-consistently.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0052-P2P-Make-p2p_flush-stop-P2P-operations-consistently.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0052-P2P-Make-p2p_flush-stop-P2P-operations-consistently.patch (original)
+++ wpa/trunk/debian/patches/upstream/0052-P2P-Make-p2p_flush-stop-P2P-operations-consistently.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 73bde309e0ad18a6af04757536721d5b9323f353 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni at qca.qualcomm.com>
Date: Mon, 27 Feb 2012 19:10:04 +0200
-Subject: [PATCH 52/58] P2P: Make p2p_flush stop P2P operations consistently
+Subject: [PATCH 52/73] P2P: Make p2p_flush stop P2P operations consistently
p2p_flush did not explicit stop all P2P operations, i.e., the exact
behavior depended on the P2P module state at the time the p2p_flush
Modified: wpa/trunk/debian/patches/upstream/0053-P2P-Fix-p2p_cancel-to-return-success-if-GO-Negotiati.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0053-P2P-Fix-p2p_cancel-to-return-success-if-GO-Negotiati.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0053-P2P-Fix-p2p_cancel-to-return-success-if-GO-Negotiati.patch (original)
+++ wpa/trunk/debian/patches/upstream/0053-P2P-Fix-p2p_cancel-to-return-success-if-GO-Negotiati.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 50ad8895b6bb3b3437105c4cc433d3a2aa3e2547 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni at qca.qualcomm.com>
Date: Thu, 1 Mar 2012 01:16:06 +0200
-Subject: [PATCH 53/58] P2P: Fix p2p_cancel to return success if GO
+Subject: [PATCH 53/73] P2P: Fix p2p_cancel to return success if GO
Negotiation is stopped
If a GO Negotiation peer is found, wpas_p2p_stop_find() stops the
Modified: wpa/trunk/debian/patches/upstream/0054-Fix-memory-leak-on-parsing-multiple-network-block-ea.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0054-Fix-memory-leak-on-parsing-multiple-network-block-ea.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0054-Fix-memory-leak-on-parsing-multiple-network-block-ea.patch (original)
+++ wpa/trunk/debian/patches/upstream/0054-Fix-memory-leak-on-parsing-multiple-network-block-ea.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 4f9fca87ac436b8047b8871d2cc88778ffc7a3dc Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j at w1.fi>
Date: Sun, 4 Mar 2012 16:13:00 +0200
-Subject: [PATCH 54/58] Fix memory leak on parsing multiple network block eap
+Subject: [PATCH 54/73] Fix memory leak on parsing multiple network block eap
entries
Signed-hostap: Jouni Malinen <j at w1.fi>
Modified: wpa/trunk/debian/patches/upstream/0055-P2P-Filter-input-parameters-in-p2p_serv_disc_externa.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0055-P2P-Filter-input-parameters-in-p2p_serv_disc_externa.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0055-P2P-Filter-input-parameters-in-p2p_serv_disc_externa.patch (original)
+++ wpa/trunk/debian/patches/upstream/0055-P2P-Filter-input-parameters-in-p2p_serv_disc_externa.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 23a9b2c61e592498c9a90ddf5601fd77b25ba3c6 Mon Sep 17 00:00:00 2001
From: Grzegorz Bajorski <grzegorz.bajorski at tieto.com>
Date: Mon, 5 Mar 2012 16:26:19 +0200
-Subject: [PATCH 55/58] P2P: Filter input parameters in p2p_serv_disc_external
+Subject: [PATCH 55/73] P2P: Filter input parameters in p2p_serv_disc_external
p2p_ctrl_serv_disc_external() can take only one parameters "0" or "1".
Modified: wpa/trunk/debian/patches/upstream/0056-TTLS-Fix-peer-challenge-generation-for-TTLS-MSCHAPv2.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0056-TTLS-Fix-peer-challenge-generation-for-TTLS-MSCHAPv2.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0056-TTLS-Fix-peer-challenge-generation-for-TTLS-MSCHAPv2.patch (original)
+++ wpa/trunk/debian/patches/upstream/0056-TTLS-Fix-peer-challenge-generation-for-TTLS-MSCHAPv2.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 201f339dd8f7920653ac647bdab1de6c04783542 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni at qca.qualcomm.com>
Date: Mon, 5 Mar 2012 16:59:03 +0200
-Subject: [PATCH 56/58] TTLS: Fix peer challenge generation for TTLS/MSCHAPv2
+Subject: [PATCH 56/73] TTLS: Fix peer challenge generation for TTLS/MSCHAPv2
Commit 30680e9332c96803533b9dae6105fd7b15b5bb52 changed the length
of the implicit challenge result to match with the exact length used
Modified: wpa/trunk/debian/patches/upstream/0057-BSS-Fix-use-after-realloc.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0057-BSS-Fix-use-after-realloc.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0057-BSS-Fix-use-after-realloc.patch (original)
+++ wpa/trunk/debian/patches/upstream/0057-BSS-Fix-use-after-realloc.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From ffda7cfaf1f7acdc38bed15a877c62b47f9e515c Mon Sep 17 00:00:00 2001
From: Eliad Peller <eliad at wizery.com>
Date: Mon, 5 Mar 2012 17:09:55 +0200
-Subject: [PATCH 57/58] BSS: Fix use-after-realloc
+Subject: [PATCH 57/73] BSS: Fix use-after-realloc
After reallocation of the bss struct, current_bss wasn't updated and
could hold an invalid pointer (which might get dereferenced later).
Modified: wpa/trunk/debian/patches/upstream/0058-dbus-Make-P2P-group-properties-accessible-individual.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0058-dbus-Make-P2P-group-properties-accessible-individual.patch?rev=1717&op=diff
==============================================================================
--- wpa/trunk/debian/patches/upstream/0058-dbus-Make-P2P-group-properties-accessible-individual.patch (original)
+++ wpa/trunk/debian/patches/upstream/0058-dbus-Make-P2P-group-properties-accessible-individual.patch Fri Apr 13 21:36:26 2012
@@ -1,7 +1,7 @@
From 03de63ceb81eed9db7506c1d124658f7f10a85d9 Mon Sep 17 00:00:00 2001
From: Todd Previte <toddx.a.previte at intel.com>
Date: Mon, 5 Mar 2012 17:25:08 +0200
-Subject: [PATCH 58/58] dbus: Make P2P group properties accessible
+Subject: [PATCH 58/73] dbus: Make P2P group properties accessible
individually
Group properties are now accessible individually. The function to retrieve
Added: wpa/trunk/debian/patches/upstream/0059-P2P-Validate-p2p_oper_channel-in-p2p_group_add.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0059-P2P-Validate-p2p_oper_channel-in-p2p_group_add.patch?rev=1717&op=file
==============================================================================
--- wpa/trunk/debian/patches/upstream/0059-P2P-Validate-p2p_oper_channel-in-p2p_group_add.patch (added)
+++ wpa/trunk/debian/patches/upstream/0059-P2P-Validate-p2p_oper_channel-in-p2p_group_add.patch Fri Apr 13 21:36:26 2012
@@ -1,0 +1,32 @@
+From ebffbce8003c7d6a177a2412014e7090476e33a7 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <jouni at qca.qualcomm.com>
+Date: Mon, 26 Mar 2012 22:06:48 +0300
+Subject: [PATCH 59/73] P2P: Validate p2p_oper_channel in p2p_group_add
+
+If the p2p_group_add command does not specify the operating channel,
+make sure the operating channel set in the configuration file meets
+the P2P requirements in the same way as is done with the frequency
+specified as the command parameter.
+
+Signed-hostap: Jouni Malinen <jouni at qca.qualcomm.com>
+(cherry picked from commit f4329aa2d08192640532b712936f5221580e9f8c)
+---
+ wpa_supplicant/p2p_supplicant.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/wpa_supplicant/p2p_supplicant.c
++++ b/wpa_supplicant/p2p_supplicant.c
+@@ -3239,6 +3239,13 @@ int wpas_p2p_group_add(struct wpa_suppli
+
+ if (wpas_p2p_init_go_params(wpa_s, ¶ms, freq))
+ return -1;
++ if (params.freq &&
++ !p2p_supported_freq(wpa_s->global->p2p, params.freq)) {
++ wpa_printf(MSG_DEBUG, "P2P: The selected channel for GO "
++ "(%u MHz) is not supported for P2P uses",
++ params.freq);
++ return -1;
++ }
+ p2p_go_params(wpa_s->global->p2p, ¶ms);
+ params.persistent_group = persistent_group;
+
Added: wpa/trunk/debian/patches/upstream/0060-P2P-Do-not-use-group-idle-timeout-during-provisionin.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0060-P2P-Do-not-use-group-idle-timeout-during-provisionin.patch?rev=1717&op=file
==============================================================================
--- wpa/trunk/debian/patches/upstream/0060-P2P-Do-not-use-group-idle-timeout-during-provisionin.patch (added)
+++ wpa/trunk/debian/patches/upstream/0060-P2P-Do-not-use-group-idle-timeout-during-provisionin.patch Fri Apr 13 21:36:26 2012
@@ -1,0 +1,34 @@
+From 64abeb43501fa24c897c4c2e0185888411d68864 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <jouni at qca.qualcomm.com>
+Date: Tue, 27 Mar 2012 18:04:06 +0300
+Subject: [PATCH 60/73] P2P: Do not use group idle timeout during provisioning
+
+Use the normal group formation timeout during the provisioning phase to
+avoid terminating this process too early due to group idle timeout.
+
+Signed-hostap: Jouni Malinen <jouni at qca.qualcomm.com>
+(cherry picked from commit 8c472816fd2a234776356de8dc26f304376c48c6)
+---
+ wpa_supplicant/p2p_supplicant.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+--- a/wpa_supplicant/p2p_supplicant.c
++++ b/wpa_supplicant/p2p_supplicant.c
+@@ -3941,6 +3941,17 @@ static void wpas_p2p_set_group_idle_time
+ if (timeout == 0)
+ return;
+
++ if (wpa_s->p2p_in_provisioning) {
++ /*
++ * Use the normal group formation timeout during the
++ * provisioning phase to avoid terminating this process too
++ * early due to group idle timeout.
++ */
++ wpa_printf(MSG_DEBUG, "P2P: Do not use P2P group idle timeout "
++ "during provisioning");
++ return;
++ }
++
+ wpa_printf(MSG_DEBUG, "P2P: Set P2P group idle timeout to %u seconds",
+ timeout);
+ eloop_register_timeout(timeout, 0, wpas_p2p_group_idle_timeout,
Added: wpa/trunk/debian/patches/upstream/0061-Sync-with-include-linux-nl80211.h-from-wireless-test.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0061-Sync-with-include-linux-nl80211.h-from-wireless-test.patch?rev=1717&op=file
==============================================================================
--- wpa/trunk/debian/patches/upstream/0061-Sync-with-include-linux-nl80211.h-from-wireless-test.patch (added)
+++ wpa/trunk/debian/patches/upstream/0061-Sync-with-include-linux-nl80211.h-from-wireless-test.patch Fri Apr 13 21:36:26 2012
@@ -1,0 +1,270 @@
+From c83f71a4742dcfa75cd86042f275c6eba2d15f78 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <j at w1.fi>
+Date: Tue, 27 Mar 2012 20:38:33 +0300
+Subject: [PATCH 61/73] Sync with include/linux/nl80211.h from
+ wireless-testing.git
+
+Signed-hostap: Jouni Malinen <j at w1.fi>
+(cherry picked from commit 17e729d49c32a02b815864ae8b85b81d24fef533)
+
+Conflicts:
+
+ src/drivers/nl80211_copy.h
+---
+ src/drivers/nl80211_copy.h | 175 ++++++++++++++++++++++++++++++++++++++++----
+ 1 file changed, 161 insertions(+), 14 deletions(-)
+
+--- a/src/drivers/nl80211_copy.h
++++ b/src/drivers/nl80211_copy.h
+@@ -156,21 +156,23 @@
+ * @NL80211_CMD_DEL_KEY: delete a key identified by %NL80211_ATTR_KEY_IDX
+ * or %NL80211_ATTR_MAC.
+ *
+- * @NL80211_CMD_GET_BEACON: retrieve beacon information (returned in a
+- * %NL80222_CMD_NEW_BEACON message)
+- * @NL80211_CMD_SET_BEACON: set the beacon on an access point interface
+- * using the %NL80211_ATTR_BEACON_INTERVAL, %NL80211_ATTR_DTIM_PERIOD,
+- * %NL80211_ATTR_BEACON_HEAD and %NL80211_ATTR_BEACON_TAIL attributes.
+- * Following attributes are provided for drivers that generate full Beacon
+- * and Probe Response frames internally: %NL80211_ATTR_SSID,
++ * @NL80211_CMD_GET_BEACON: (not used)
++ * @NL80211_CMD_SET_BEACON: change the beacon on an access point interface
++ * using the %NL80211_ATTR_BEACON_HEAD and %NL80211_ATTR_BEACON_TAIL
++ * attributes. For drivers that generate the beacon and probe responses
++ * internally, the following attributes must be provided: %NL80211_ATTR_IE,
++ * %NL80211_ATTR_IE_PROBE_RESP and %NL80211_ATTR_IE_ASSOC_RESP.
++ * @NL80211_CMD_START_AP: Start AP operation on an AP interface, parameters
++ * are like for %NL80211_CMD_SET_BEACON, and additionally parameters that
++ * do not change are used, these include %NL80211_ATTR_BEACON_INTERVAL,
++ * %NL80211_ATTR_DTIM_PERIOD, %NL80211_ATTR_SSID,
+ * %NL80211_ATTR_HIDDEN_SSID, %NL80211_ATTR_CIPHERS_PAIRWISE,
+ * %NL80211_ATTR_CIPHER_GROUP, %NL80211_ATTR_WPA_VERSIONS,
+ * %NL80211_ATTR_AKM_SUITES, %NL80211_ATTR_PRIVACY,
+- * %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_IE, %NL80211_ATTR_IE_PROBE_RESP,
+- * %NL80211_ATTR_IE_ASSOC_RESP.
+- * @NL80211_CMD_NEW_BEACON: add a new beacon to an access point interface,
+- * parameters are like for %NL80211_CMD_SET_BEACON.
+- * @NL80211_CMD_DEL_BEACON: remove the beacon, stop sending it
++ * %NL80211_ATTR_AUTH_TYPE and %NL80211_ATTR_INACTIVITY_TIMEOUT.
++ * @NL80211_CMD_NEW_BEACON: old alias for %NL80211_CMD_START_AP
++ * @NL80211_CMD_STOP_AP: Stop AP operation on the given interface
++ * @NL80211_CMD_DEL_BEACON: old alias for %NL80211_CMD_STOP_AP
+ *
+ * @NL80211_CMD_GET_STATION: Get station attributes for station identified by
+ * %NL80211_ATTR_MAC on the interface identified by %NL80211_ATTR_IFINDEX.
+@@ -367,6 +369,11 @@
+ * %NL80211_ATTR_WIPHY_FREQ, %NL80211_ATTR_CONTROL_PORT,
+ * %NL80211_ATTR_CONTROL_PORT_ETHERTYPE and
+ * %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT.
++ * Background scan period can optionally be
++ * specified in %NL80211_ATTR_BG_SCAN_PERIOD,
++ * if not specified default background scan configuration
++ * in driver is used and if period value is 0, bg scan will be disabled.
++ * This attribute is ignored if driver does not support roam scan.
+ * It is also sent as an event, with the BSSID and response IEs when the
+ * connection is established or failed to be established. This can be
+ * determined by the STATUS_CODE attribute.
+@@ -533,8 +540,10 @@ enum nl80211_commands {
+
+ NL80211_CMD_GET_BEACON,
+ NL80211_CMD_SET_BEACON,
+- NL80211_CMD_NEW_BEACON,
+- NL80211_CMD_DEL_BEACON,
++ NL80211_CMD_START_AP,
++ NL80211_CMD_NEW_BEACON = NL80211_CMD_START_AP,
++ NL80211_CMD_STOP_AP,
++ NL80211_CMD_DEL_BEACON = NL80211_CMD_STOP_AP,
+
+ NL80211_CMD_GET_STATION,
+ NL80211_CMD_SET_STATION,
+@@ -1109,6 +1118,59 @@ enum nl80211_commands {
+ * %NL80211_CMD_TDLS_MGMT. Otherwise %NL80211_CMD_TDLS_OPER should be
+ * used for asking the driver to perform a TDLS operation.
+ *
++ * @NL80211_ATTR_DEVICE_AP_SME: This u32 attribute may be listed for devices
++ * that have AP support to indicate that they have the AP SME integrated
++ * with support for the features listed in this attribute, see
++ * &enum nl80211_ap_sme_features.
++ *
++ * @NL80211_ATTR_DONT_WAIT_FOR_ACK: Used with %NL80211_CMD_FRAME, this tells
++ * the driver to not wait for an acknowledgement. Note that due to this,
++ * it will also not give a status callback nor return a cookie. This is
++ * mostly useful for probe responses to save airtime.
++ *
++ * @NL80211_ATTR_FEATURE_FLAGS: This u32 attribute contains flags from
++ * &enum nl80211_feature_flags and is advertised in wiphy information.
++ * @NL80211_ATTR_PROBE_RESP_OFFLOAD: Indicates that the HW responds to probe
++ *
++ * requests while operating in AP-mode.
++ * This attribute holds a bitmap of the supported protocols for
++ * offloading (see &enum nl80211_probe_resp_offload_support_attr).
++ *
++ * @NL80211_ATTR_PROBE_RESP: Probe Response template data. Contains the entire
++ * probe-response frame. The DA field in the 802.11 header is zero-ed out,
++ * to be filled by the FW.
++ * @NL80211_ATTR_DISABLE_HT: Force HT capable interfaces to disable
++ * this feature. Currently, only supported in mac80211 drivers.
++ * @NL80211_ATTR_HT_CAPABILITY_MASK: Specify which bits of the
++ * ATTR_HT_CAPABILITY to which attention should be paid.
++ * Currently, only mac80211 NICs support this feature.
++ * The values that may be configured are:
++ * MCS rates, MAX-AMSDU, HT-20-40 and HT_CAP_SGI_40
++ * AMPDU density and AMPDU factor.
++ * All values are treated as suggestions and may be ignored
++ * by the driver as required. The actual values may be seen in
++ * the station debugfs ht_caps file.
++ *
++ * @NL80211_ATTR_DFS_REGION: region for regulatory rules which this country
++ * abides to when initiating radiation on DFS channels. A country maps
++ * to one DFS region.
++ *
++ * @NL80211_ATTR_NOACK_MAP: This u16 bitmap contains the No Ack Policy of
++ * up to 16 TIDs.
++ *
++ * @NL80211_ATTR_INACTIVITY_TIMEOUT: timeout value in seconds, this can be
++ * used by the drivers which has MLME in firmware and does not have support
++ * to report per station tx/rx activity to free up the staion entry from
++ * the list. This needs to be used when the driver advertises the
++ * capability to timeout the stations.
++ *
++ * @NL80211_ATTR_RX_SIGNAL_DBM: signal strength in dBm (as a 32-bit int);
++ * this attribute is (depending on the driver capabilities) added to
++ * received frames indicated with %NL80211_CMD_FRAME.
++ *
++ * @NL80211_ATTR_BG_SCAN_PERIOD: Background scan period in seconds
++ * or 0 to disable background scan.
++ *
+ * @NL80211_ATTR_MAX: highest attribute number currently defined
+ * @__NL80211_ATTR_AFTER_LAST: internal use
+ */
+@@ -1337,6 +1399,29 @@ enum nl80211_attrs {
+ NL80211_ATTR_TDLS_SUPPORT,
+ NL80211_ATTR_TDLS_EXTERNAL_SETUP,
+
++ NL80211_ATTR_DEVICE_AP_SME,
++
++ NL80211_ATTR_DONT_WAIT_FOR_ACK,
++
++ NL80211_ATTR_FEATURE_FLAGS,
++
++ NL80211_ATTR_PROBE_RESP_OFFLOAD,
++
++ NL80211_ATTR_PROBE_RESP,
++
++ NL80211_ATTR_DFS_REGION,
++
++ NL80211_ATTR_DISABLE_HT,
++ NL80211_ATTR_HT_CAPABILITY_MASK,
++
++ NL80211_ATTR_NOACK_MAP,
++
++ NL80211_ATTR_INACTIVITY_TIMEOUT,
++
++ NL80211_ATTR_RX_SIGNAL_DBM,
++
++ NL80211_ATTR_BG_SCAN_PERIOD,
++
+ /* add attributes here, update the policy in nl80211.c */
+
+ __NL80211_ATTR_AFTER_LAST,
+@@ -1373,6 +1458,7 @@ enum nl80211_attrs {
+ #define NL80211_ATTR_KEYS NL80211_ATTR_KEYS
+
+ #define NL80211_MAX_SUPP_RATES 32
++#define NL80211_MAX_SUPP_HT_RATES 77
+ #define NL80211_MAX_SUPP_REG_RULES 32
+ #define NL80211_TKIP_DATA_OFFSET_ENCR_KEY 0
+ #define NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY 16
+@@ -1975,6 +2061,17 @@ enum nl80211_mntr_flags {
+ * access to a broader network beyond the MBSS. This is done via Root
+ * Announcement frames.
+ *
++ * @NL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL: The minimum interval of time (in
++ * TUs) during which a mesh STA can send only one Action frame containing a
++ * PERR element.
++ *
++ * @NL80211_MESHCONF_FORWARDING: set Mesh STA as forwarding or non-forwarding
++ * or forwarding entity (default is TRUE - forwarding entity)
++ *
++ * @NL80211_MESHCONF_RSSI_THRESHOLD: RSSI threshold in dBm. This specifies the
++ * threshold for average signal strength of candidate station to establish
++ * a peer link.
++ *
+ * @NL80211_MESHCONF_ATTR_MAX: highest possible mesh configuration attribute
+ *
+ * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use
+@@ -1998,6 +2095,9 @@ enum nl80211_meshconf_params {
+ NL80211_MESHCONF_ELEMENT_TTL,
+ NL80211_MESHCONF_HWMP_RANN_INTERVAL,
+ NL80211_MESHCONF_GATE_ANNOUNCEMENTS,
++ NL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL,
++ NL80211_MESHCONF_FORWARDING,
++ NL80211_MESHCONF_RSSI_THRESHOLD,
+
+ /* keep last */
+ __NL80211_MESHCONF_ATTR_AFTER_LAST,
+@@ -2271,12 +2371,15 @@ enum nl80211_key_attributes {
+ * in an array of rates as defined in IEEE 802.11 7.3.2.2 (u8 values with
+ * 1 = 500 kbps) but without the IE length restriction (at most
+ * %NL80211_MAX_SUPP_RATES in a single array).
++ * @NL80211_TXRATE_MCS: HT (MCS) rates allowed for TX rate selection
++ * in an array of MCS numbers.
+ * @__NL80211_TXRATE_AFTER_LAST: internal
+ * @NL80211_TXRATE_MAX: highest TX rate attribute
+ */
+ enum nl80211_tx_rate_attributes {
+ __NL80211_TXRATE_INVALID,
+ NL80211_TXRATE_LEGACY,
++ NL80211_TXRATE_MCS,
+
+ /* keep last */
+ __NL80211_TXRATE_AFTER_LAST,
+@@ -2648,4 +2751,48 @@ enum nl80211_tdls_operation {
+ NL80211_TDLS_DISABLE_LINK,
+ };
+
++/*
++ * enum nl80211_ap_sme_features - device-integrated AP features
++ * Reserved for future use, no bits are defined in
++ * NL80211_ATTR_DEVICE_AP_SME yet.
++enum nl80211_ap_sme_features {
++};
++ */
++
++/**
++ * enum nl80211_feature_flags - device/driver features
++ * @NL80211_FEATURE_SK_TX_STATUS: This driver supports reflecting back
++ * TX status to the socket error queue when requested with the
++ * socket option.
++ * @NL80211_FEATURE_HT_IBSS: This driver supports IBSS with HT datarates.
++ * @NL80211_FEATURE_INACTIVITY_TIMER: This driver takes care of freeing up
++ * the connected inactive stations in AP mode.
++ */
++enum nl80211_feature_flags {
++ NL80211_FEATURE_SK_TX_STATUS = 1 << 0,
++ NL80211_FEATURE_HT_IBSS = 1 << 1,
++ NL80211_FEATURE_INACTIVITY_TIMER = 1 << 2,
++};
++
++/**
++ * enum nl80211_probe_resp_offload_support_attr - optional supported
++ * protocols for probe-response offloading by the driver/FW.
++ * To be used with the %NL80211_ATTR_PROBE_RESP_OFFLOAD attribute.
++ * Each enum value represents a bit in the bitmap of supported
++ * protocols. Typically a subset of probe-requests belonging to a
++ * supported protocol will be excluded from offload and uploaded
++ * to the host.
++ *
++ * @NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS: Support for WPS ver. 1
++ * @NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS2: Support for WPS ver. 2
++ * @NL80211_PROBE_RESP_OFFLOAD_SUPPORT_P2P: Support for P2P
++ * @NL80211_PROBE_RESP_OFFLOAD_SUPPORT_80211U: Support for 802.11u
++ */
++enum nl80211_probe_resp_offload_support_attr {
++ NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS = 1<<0,
++ NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS2 = 1<<1,
++ NL80211_PROBE_RESP_OFFLOAD_SUPPORT_P2P = 1<<2,
++ NL80211_PROBE_RESP_OFFLOAD_SUPPORT_80211U = 1<<3,
++};
++
+ #endif /* __LINUX_NL80211_H */
Added: wpa/trunk/debian/patches/upstream/0062-P2P-Add-support-for-preferred-channel-list.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0062-P2P-Add-support-for-preferred-channel-list.patch?rev=1717&op=file
==============================================================================
--- wpa/trunk/debian/patches/upstream/0062-P2P-Add-support-for-preferred-channel-list.patch (added)
+++ wpa/trunk/debian/patches/upstream/0062-P2P-Add-support-for-preferred-channel-list.patch Fri Apr 13 21:36:26 2012
@@ -1,0 +1,320 @@
+From 8ac67bc0f675ef1c2d76b3a3a615ce712a25f895 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <jouni at qca.qualcomm.com>
+Date: Thu, 29 Mar 2012 21:28:34 +0300
+Subject: [PATCH 62/73] P2P: Add support for preferred channel list
+
+p2p_pref_chan configuration parameter can now be used to set the
+list of preferred channel for P2P GO Negotiation. This will be used
+in the priority order if the peer does not support the channel we
+are trying to use as the GO (configured operating channel or the
+best 2.4 GHz/5 GHz channel) for the case where a forced channel is
+not used.
+
+p2p_pref_chan=<op class:channel>,...
+
+For example:
+p2p_pref_chan=81:1,81:2,81:3,81:4,81:5,81:6
+
+This would configure 2.4 GHz channels 1-6 as the preferred ones with
+channel 1 the most preferred option.
+
+These configuration parameters can be set in wpa_supplicant.conf and
+dynamically updated with "wpa_cli set <param> <value>".
+
+Signed-hostap: Jouni Malinen <jouni at qca.qualcomm.com>
+(cherry picked from commit 21d996f775a2131bb0c73d6e18ca9b382f017057)
+
+Conflicts:
+
+ wpa_supplicant/config.c
+---
+ src/p2p/p2p.c | 33 +++++++++++++++++++++++++
+ src/p2p/p2p.h | 25 +++++++++++++++++++
+ src/p2p/p2p_go_neg.c | 16 ++++++++++++
+ wpa_supplicant/config.c | 52 +++++++++++++++++++++++++++++++++++++++
+ wpa_supplicant/config.h | 3 +++
+ wpa_supplicant/config_file.c | 11 +++++++++
+ wpa_supplicant/p2p_supplicant.c | 8 ++++++
+ 7 files changed, 148 insertions(+)
+
+--- a/src/p2p/p2p.c
++++ b/src/p2p/p2p.c
+@@ -2206,6 +2206,16 @@ struct p2p_data * p2p_init(const struct
+ p2p->cfg->model_number = os_strdup(cfg->model_number);
+ if (cfg->serial_number)
+ p2p->cfg->serial_number = os_strdup(cfg->serial_number);
++ if (cfg->pref_chan) {
++ p2p->cfg->pref_chan = os_malloc(cfg->num_pref_chan *
++ sizeof(struct p2p_channel));
++ if (p2p->cfg->pref_chan) {
++ os_memcpy(p2p->cfg->pref_chan, cfg->pref_chan,
++ cfg->num_pref_chan *
++ sizeof(struct p2p_channel));
++ } else
++ p2p->cfg->num_pref_chan = 0;
++ }
+
+ p2p->min_disc_int = 1;
+ p2p->max_disc_int = 3;
+@@ -2240,6 +2250,7 @@ void p2p_deinit(struct p2p_data *p2p)
+ os_free(p2p->cfg->model_name);
+ os_free(p2p->cfg->model_number);
+ os_free(p2p->cfg->serial_number);
++ os_free(p2p->cfg->pref_chan);
+ os_free(p2p->groups);
+ wpabuf_free(p2p->sd_resp);
+ os_free(p2p->after_scan_tx);
+@@ -3694,6 +3705,28 @@ int p2p_set_oper_channel(struct p2p_data
+ return 0;
+ }
+
++
++int p2p_set_pref_chan(struct p2p_data *p2p, unsigned int num_pref_chan,
++ const struct p2p_channel *pref_chan)
++{
++ struct p2p_channel *n;
++
++ if (pref_chan) {
++ n = os_malloc(num_pref_chan * sizeof(struct p2p_channel));
++ if (n == NULL)
++ return -1;
++ os_memcpy(n, pref_chan,
++ num_pref_chan * sizeof(struct p2p_channel));
++ } else
++ n = NULL;
++
++ os_free(p2p->cfg->pref_chan);
++ p2p->cfg->pref_chan = n;
++ p2p->cfg->num_pref_chan = num_pref_chan;
++
++ return 0;
++}
++
+
+ int p2p_get_interface_addr(struct p2p_data *p2p, const u8 *dev_addr,
+ u8 *iface_addr)
+--- a/src/p2p/p2p.h
++++ b/src/p2p/p2p.h
+@@ -224,6 +224,11 @@ enum p2p_prov_disc_status {
+ P2P_PROV_DISC_REJECTED,
+ };
+
++struct p2p_channel {
++ u8 op_class;
++ u8 chan;
++};
++
+ /**
+ * struct p2p_config - P2P configuration
+ *
+@@ -271,6 +276,16 @@ struct p2p_config {
+ struct p2p_channels channels;
+
+ /**
++ * num_pref_chan - Number of pref_chan entries
++ */
++ unsigned int num_pref_chan;
++
++ /**
++ * pref_chan - Preferred channels for GO Negotiation
++ */
++ struct p2p_channel *pref_chan;
++
++ /**
+ * pri_dev_type - Primary Device Type (see WPS)
+ */
+ u8 pri_dev_type[8];
+@@ -1614,6 +1629,16 @@ int p2p_set_oper_channel(struct p2p_data
+ int cfg_op_channel);
+
+ /**
++ * p2p_set_pref_chan - Set P2P preferred channel list
++ * @p2p: P2P module context from p2p_init()
++ * @num_pref_chan: Number of entries in pref_chan list
++ * @pref_chan: Preferred channels or %NULL to remove preferences
++ * Returns: 0 on success, -1 on failure
++ */
++int p2p_set_pref_chan(struct p2p_data *p2p, unsigned int num_pref_chan,
++ const struct p2p_channel *pref_chan);
++
++/**
+ * p2p_in_progress - Check whether a P2P operation is progress
+ * @p2p: P2P module context from p2p_init()
+ * Returns: 0 if P2P module is idle or 1 if an operation is in progress
+--- a/src/p2p/p2p_go_neg.c
++++ b/src/p2p/p2p_go_neg.c
+@@ -302,6 +302,7 @@ static void p2p_reselect_channel(struct
+ struct p2p_reg_class *cl;
+ int freq;
+ u8 op_reg_class, op_channel;
++ unsigned int i;
+
+ wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Selected operating "
+ "channel (reg_class %u channel %u) not acceptable to the "
+@@ -334,6 +335,21 @@ static void p2p_reselect_channel(struct
+ return;
+ }
+
++ /* Select channel with highest preference if the peer supports it */
++ for (i = 0; p2p->cfg->pref_chan && i < p2p->cfg->num_pref_chan; i++) {
++ if (p2p_channels_includes(intersection,
++ p2p->cfg->pref_chan[i].op_class,
++ p2p->cfg->pref_chan[i].chan)) {
++ p2p->op_reg_class = p2p->cfg->pref_chan[i].op_class;
++ p2p->op_channel = p2p->cfg->pref_chan[i].chan;
++ wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Pick "
++ "highest preferred chnnel (op_class %u "
++ "channel %u) from intersection",
++ p2p->op_reg_class, p2p->op_channel);
++ return;
++ }
++ }
++
+ /*
+ * Fall back to whatever is included in the channel intersection since
+ * no better options seems to be available.
+--- a/wpa_supplicant/config.c
++++ b/wpa_supplicant/config.c
+@@ -19,6 +19,7 @@
+ #include "crypto/sha1.h"
+ #include "rsn_supp/wpa.h"
+ #include "eap_peer/eap.h"
++#include "p2p/p2p.h"
+ #include "config.h"
+
+
+@@ -1821,6 +1822,7 @@ void wpa_config_free(struct wpa_config *
+ os_free(config->home_ca_cert);
+ os_free(config->home_imsi);
+ os_free(config->home_milenage);
++ os_free(config->p2p_pref_chan);
+ os_free(config);
+ }
+
+@@ -2495,6 +2497,55 @@ static int wpa_config_process_sec_device
+ config->num_sec_device_types++;
+ return 0;
+ }
++
++
++static int wpa_config_process_p2p_pref_chan(
++ const struct global_parse_data *data,
++ struct wpa_config *config, int line, const char *pos)
++{
++ struct p2p_channel *pref = NULL, *n;
++ unsigned int num = 0;
++ const char *pos2;
++ u8 op_class, chan;
++
++ /* format: class:chan,class:chan,... */
++
++ while (*pos) {
++ op_class = atoi(pos);
++ pos2 = os_strchr(pos, ':');
++ if (pos2 == NULL)
++ goto fail;
++ pos2++;
++ chan = atoi(pos2);
++
++ n = os_realloc(pref, (num + 1) * sizeof(struct p2p_channel));
++ if (n == NULL)
++ goto fail;
++ pref = n;
++ pref[num].op_class = op_class;
++ pref[num].chan = chan;
++ num++;
++
++ pos = os_strchr(pos2, ',');
++ if (pos == NULL)
++ break;
++ pos++;
++ }
++
++ os_free(config->p2p_pref_chan);
++ config->p2p_pref_chan = pref;
++ config->num_p2p_pref_chan = num;
++ wpa_hexdump(MSG_DEBUG, "P2P: Preferred class/channel pairs",
++ (u8 *) config->p2p_pref_chan,
++ config->num_p2p_pref_chan * sizeof(struct p2p_channel));
++
++ return 0;
++
++fail:
++ os_free(pref);
++ wpa_printf(MSG_ERROR, "Line %d: Invalid p2p_pref_chan list", line);
++ return -1;
++}
+ #endif /* CONFIG_P2P */
+
+
+@@ -2569,6 +2620,7 @@ static const struct global_parse_data gl
+ { INT_RANGE(persistent_reconnect, 0, 1), 0 },
+ { INT_RANGE(p2p_intra_bss, 0, 1), CFG_CHANGED_P2P_INTRA_BSS },
+ { INT(p2p_group_idle), 0 },
++ { FUNC(p2p_pref_chan), CFG_CHANGED_P2P_PREF_CHAN },
+ #endif /* CONFIG_P2P */
+ { FUNC(country), CFG_CHANGED_COUNTRY },
+ { INT(bss_max_count), 0 },
+--- a/wpa_supplicant/config.h
++++ b/wpa_supplicant/config.h
+@@ -47,6 +47,7 @@
+ #define CFG_CHANGED_VENDOR_EXTENSION BIT(10)
+ #define CFG_CHANGED_P2P_LISTEN_CHANNEL BIT(11)
+ #define CFG_CHANGED_P2P_OPER_CHANNEL BIT(12)
++#define CFG_CHANGED_P2P_PREF_CHAN BIT(13)
+
+ /**
+ * struct wpa_config - wpa_supplicant configuration data
+@@ -362,6 +363,8 @@ struct wpa_config {
+ char *p2p_ssid_postfix;
+ int persistent_reconnect;
+ int p2p_intra_bss;
++ unsigned int num_p2p_pref_chan;
++ struct p2p_channel *p2p_pref_chan;
+
+ #define MAX_WPS_VENDOR_EXT 10
+ /**
+--- a/wpa_supplicant/config_file.c
++++ b/wpa_supplicant/config_file.c
+@@ -22,6 +22,7 @@
+ #include "config.h"
+ #include "base64.h"
+ #include "uuid.h"
++#include "p2p/p2p.h"
+
+
+ /**
+@@ -699,6 +700,16 @@ static void wpa_config_write_global(FILE
+ fprintf(f, "p2p_intra_bss=%u\n", config->p2p_intra_bss);
+ if (config->p2p_group_idle)
+ fprintf(f, "p2p_group_idle=%u\n", config->p2p_group_idle);
++ if (config->p2p_pref_chan) {
++ unsigned int i;
++ fprintf(f, "p2p_pref_chan=");
++ for (i = 0; i < config->num_p2p_pref_chan; i++) {
++ fprintf(f, "%s%u:%u", i > 0 ? "," : "",
++ config->p2p_pref_chan[i].op_class,
++ config->p2p_pref_chan[i].chan);
++ }
++ fprintf(f, "\n");
++ }
+ #endif /* CONFIG_P2P */
+ if (config->country[0] && config->country[1]) {
+ fprintf(f, "country=%c%c\n",
+--- a/wpa_supplicant/p2p_supplicant.c
++++ b/wpa_supplicant/p2p_supplicant.c
+@@ -4095,6 +4095,14 @@ void wpas_p2p_update_config(struct wpa_s
+ wpa_printf(MSG_ERROR, "P2P: Own oper channel update "
+ "failed: %d", ret);
+ }
++
++ if (wpa_s->conf->changed_parameters & CFG_CHANGED_P2P_PREF_CHAN) {
++ if (p2p_set_pref_chan(p2p, wpa_s->conf->num_p2p_pref_chan,
++ wpa_s->conf->p2p_pref_chan) < 0) {
++ wpa_printf(MSG_ERROR, "P2P: Preferred channel list "
++ "update failed");
++ }
++ }
+ }
+
+
Added: wpa/trunk/debian/patches/upstream/0063-Clear-previous-BSSID-on-explicit-disconnection-reque.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0063-Clear-previous-BSSID-on-explicit-disconnection-reque.patch?rev=1717&op=file
==============================================================================
--- wpa/trunk/debian/patches/upstream/0063-Clear-previous-BSSID-on-explicit-disconnection-reque.patch (added)
+++ wpa/trunk/debian/patches/upstream/0063-Clear-previous-BSSID-on-explicit-disconnection-reque.patch Fri Apr 13 21:36:26 2012
@@ -1,0 +1,46 @@
+From 49de0c35be1cb775bb4cfb015caf5e64108c7f15 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <jouni at qca.qualcomm.com>
+Date: Fri, 23 Mar 2012 16:12:07 -0700
+Subject: [PATCH 63/73] Clear previous BSSID on explicit disconnection request
+
+There is no need to use reassociation instead of association in a case
+the previous connection was explicitly disconnected.
+
+Signed-hostap: Jouni Malinen <jouni at qca.qualcomm.com>
+(cherry picked from commit 83df8149463fe6e9ddf056b092f2d1907c073b53)
+---
+ wpa_supplicant/ctrl_iface.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+--- a/wpa_supplicant/ctrl_iface.c
++++ b/wpa_supplicant/ctrl_iface.c
+@@ -1584,6 +1584,9 @@ static int wpa_supplicant_ctrl_iface_rem
+ }
+ eapol_sm_invalidate_cached_session(wpa_s->eapol);
+ if (wpa_s->current_ssid) {
++#ifdef CONFIG_SME
++ wpa_s->sme.prev_bssid_set = 0;
++#endif /* CONFIG_SME */
+ wpa_sm_set_config(wpa_s->wpa, NULL);
+ eapol_sm_notify_config(wpa_s->eapol, NULL, NULL);
+ wpa_supplicant_disassociate(wpa_s,
+@@ -1606,6 +1609,9 @@ static int wpa_supplicant_ctrl_iface_rem
+ }
+
+ if (ssid == wpa_s->current_ssid || wpa_s->current_ssid == NULL) {
++#ifdef CONFIG_SME
++ wpa_s->sme.prev_bssid_set = 0;
++#endif /* CONFIG_SME */
+ /*
+ * Invalidate the EAP session cache if the current or
+ * previously used network is removed.
+@@ -3579,6 +3585,9 @@ char * wpa_supplicant_ctrl_iface_process
+ reply_len = wpa_supplicant_ctrl_iface_list_networks(
+ wpa_s, reply, reply_size);
+ } else if (os_strcmp(buf, "DISCONNECT") == 0) {
++#ifdef CONFIG_SME
++ wpa_s->sme.prev_bssid_set = 0;
++#endif /* CONFIG_SME */
+ wpa_s->reassociate = 0;
+ wpa_s->disconnected = 1;
+ wpa_supplicant_deauthenticate(wpa_s,
Added: wpa/trunk/debian/patches/upstream/0064-P2P-Use-P2P-Device-ID-attribute-if-Device-Info-not-a.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0064-P2P-Use-P2P-Device-ID-attribute-if-Device-Info-not-a.patch?rev=1717&op=file
==============================================================================
--- wpa/trunk/debian/patches/upstream/0064-P2P-Use-P2P-Device-ID-attribute-if-Device-Info-not-a.patch (added)
+++ wpa/trunk/debian/patches/upstream/0064-P2P-Use-P2P-Device-ID-attribute-if-Device-Info-not-a.patch Fri Apr 13 21:36:26 2012
@@ -1,0 +1,51 @@
+From 7deec79beb60df7ecf031d449c99860741c4e889 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <jouni at qca.qualcomm.com>
+Date: Fri, 30 Mar 2012 15:50:33 +0300
+Subject: [PATCH 64/73] P2P: Use P2P Device ID attribute if Device Info not
+ available
+
+The "BSS p2p_dev_addr=address" command uses p2p_parse_dev_addr() to
+figure out the P2P Device Address of the GO from scan results. This used
+to work only if the P2P IE was received from Probe Response frames since
+only those include the P2P Device Info attribute. Make this work with
+Beacon frames, too, by using P2P Device ID attribute if the P2P Device
+Info attribute is not present.
+
+Signed-hostap: Jouni Malinen <jouni at qca.qualcomm.com>
+(cherry picked from commit 526ec4aee84ed1ab25930d4445161a02aa5937cb)
+---
+ src/p2p/p2p.c | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+--- a/src/p2p/p2p.c
++++ b/src/p2p/p2p.c
+@@ -2110,6 +2110,7 @@ int p2p_parse_dev_addr(const u8 *ies, si
+ {
+ struct wpabuf *p2p_ie;
+ struct p2p_message msg;
++ int ret = -1;
+
+ p2p_ie = ieee802_11_vendor_ie_concat(ies, ies_len,
+ P2P_IE_VENDOR_TYPE);
+@@ -2121,14 +2122,16 @@ int p2p_parse_dev_addr(const u8 *ies, si
+ return -1;
+ }
+
+- if (msg.p2p_device_addr == NULL) {
+- wpabuf_free(p2p_ie);
+- return -1;
++ if (msg.p2p_device_addr) {
++ os_memcpy(dev_addr, msg.p2p_device_addr, ETH_ALEN);
++ ret = 0;
++ } else if (msg.device_id) {
++ os_memcpy(dev_addr, msg.device_id, ETH_ALEN);
++ ret = 0;
+ }
+
+- os_memcpy(dev_addr, msg.p2p_device_addr, ETH_ALEN);
+ wpabuf_free(p2p_ie);
+- return 0;
++ return ret;
+ }
+
+
Added: wpa/trunk/debian/patches/upstream/0065-Fix-potential-double-free-and-use-of-freed-memory-in.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0065-Fix-potential-double-free-and-use-of-freed-memory-in.patch?rev=1717&op=file
==============================================================================
--- wpa/trunk/debian/patches/upstream/0065-Fix-potential-double-free-and-use-of-freed-memory-in.patch (added)
+++ wpa/trunk/debian/patches/upstream/0065-Fix-potential-double-free-and-use-of-freed-memory-in.patch Fri Apr 13 21:36:26 2012
@@ -1,0 +1,29 @@
+From 3dc4c19aa4c72987b98d9d8237ee082b4c96c6ee Mon Sep 17 00:00:00 2001
+From: Alexander Couzens <lynxis at c-base.org>
+Date: Sun, 1 Apr 2012 13:36:52 +0300
+Subject: [PATCH 65/73] Fix potential double free and use of freed memory in
+ RADIUS client
+
+ieee802_1x_encapsulate_radius() frees the RADIUS message if
+radius_client_send() returns error. This could have resulted in use of
+freed memory and double freeing of the RADIUS message if send() fails
+since the message is also left in the retransmit list. Avoid this by not
+returning error to the caller in such a case.
+
+Signed-off-by: Alexander Couzens <lynxis at c-base.org>
+(cherry picked from commit a4e73a0e470cde6fcf3983aca277f01540bb37fa)
+---
+ src/radius/radius_client.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/radius/radius_client.c
++++ b/src/radius/radius_client.c
+@@ -684,7 +684,7 @@ int radius_client_send(struct radius_cli
+ radius_client_list_add(radius, msg, msg_type, shared_secret,
+ shared_secret_len, addr);
+
+- return res;
++ return 0;
+ }
+
+
Added: wpa/trunk/debian/patches/upstream/0066-Fix-memory-leaks-on-radius_client_send-error-paths.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0066-Fix-memory-leaks-on-radius_client_send-error-paths.patch?rev=1717&op=file
==============================================================================
--- wpa/trunk/debian/patches/upstream/0066-Fix-memory-leaks-on-radius_client_send-error-paths.patch (added)
+++ wpa/trunk/debian/patches/upstream/0066-Fix-memory-leaks-on-radius_client_send-error-paths.patch Fri Apr 13 21:36:26 2012
@@ -1,0 +1,80 @@
+From 39a41530414ddd20252f4b0393396638943534e0 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <j at w1.fi>
+Date: Sun, 1 Apr 2012 17:55:20 +0300
+Subject: [PATCH 66/73] Fix memory leaks on radius_client_send error paths
+
+In case this function returns an error, the RADIUS message needs to
+freed in the caller.
+
+Signed-hostap: Jouni Malinen <j at w1.fi>
+(cherry picked from commit ca8e039fec1352e2ece4fdbd6fde92fd461565a3)
+---
+ radius_example/radius_example.c | 3 ++-
+ src/ap/accounting.c | 15 +++++++++------
+ src/ap/ieee802_11_auth.c | 3 ++-
+ wpa_supplicant/eapol_test.c | 4 +++-
+ 4 files changed, 16 insertions(+), 9 deletions(-)
+
+--- a/src/ap/accounting.c
++++ b/src/ap/accounting.c
+@@ -265,8 +265,9 @@ void accounting_sta_start(struct hostapd
+ hapd, sta);
+
+ msg = accounting_msg(hapd, sta, RADIUS_ACCT_STATUS_TYPE_START);
+- if (msg)
+- radius_client_send(hapd->radius, msg, RADIUS_ACCT, sta->addr);
++ if (msg &&
++ radius_client_send(hapd->radius, msg, RADIUS_ACCT, sta->addr) < 0)
++ radius_msg_free(msg);
+
+ sta->acct_session_started = 1;
+ }
+@@ -364,9 +365,10 @@ static void accounting_sta_report(struct
+ goto fail;
+ }
+
+- radius_client_send(hapd->radius, msg,
+- stop ? RADIUS_ACCT : RADIUS_ACCT_INTERIM,
+- sta->addr);
++ if (radius_client_send(hapd->radius, msg,
++ stop ? RADIUS_ACCT : RADIUS_ACCT_INTERIM,
++ sta->addr) < 0)
++ goto fail;
+ return;
+
+ fail:
+@@ -469,7 +471,8 @@ static void accounting_report_state(stru
+ return;
+ }
+
+- radius_client_send(hapd->radius, msg, RADIUS_ACCT, NULL);
++ if (radius_client_send(hapd->radius, msg, RADIUS_ACCT, NULL) < 0)
++ radius_msg_free(msg);
+ }
+
+
+--- a/src/ap/ieee802_11_auth.c
++++ b/src/ap/ieee802_11_auth.c
+@@ -191,7 +191,8 @@ static int hostapd_radius_acl_query(stru
+ goto fail;
+ }
+
+- radius_client_send(hapd->radius, msg, RADIUS_AUTH, addr);
++ if (radius_client_send(hapd->radius, msg, RADIUS_AUTH, addr) < 0)
++ goto fail;
+ return 0;
+
+ fail:
+--- a/wpa_supplicant/eapol_test.c
++++ b/wpa_supplicant/eapol_test.c
+@@ -284,7 +284,9 @@ static void ieee802_1x_encapsulate_radiu
+ }
+ }
+
+- radius_client_send(e->radius, msg, RADIUS_AUTH, e->wpa_s->own_addr);
++ if (radius_client_send(e->radius, msg, RADIUS_AUTH, e->wpa_s->own_addr)
++ < 0)
++ goto fail;
+ return;
+
+ fail:
Added: wpa/trunk/debian/patches/upstream/0067-P2P-Add-deinit_p2p_cli-op-to-clear-P2P-client-driver.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0067-P2P-Add-deinit_p2p_cli-op-to-clear-P2P-client-driver.patch?rev=1717&op=file
==============================================================================
--- wpa/trunk/debian/patches/upstream/0067-P2P-Add-deinit_p2p_cli-op-to-clear-P2P-client-driver.patch (added)
+++ wpa/trunk/debian/patches/upstream/0067-P2P-Add-deinit_p2p_cli-op-to-clear-P2P-client-driver.patch Fri Apr 13 21:36:26 2012
@@ -1,0 +1,99 @@
+From c3181cc428976426606ed7571b7d19947841d35b Mon Sep 17 00:00:00 2001
+From: Eliad Peller <eliad at wizery.com>
+Date: Sun, 1 Apr 2012 21:41:23 +0300
+Subject: [PATCH 67/73] P2P: Add deinit_p2p_cli op to clear P2P client driver
+ state
+
+On P2P group removal, the GO is deinitialized correctly (and the vif
+mode is set back to sta in case of nl80211), but the P2P client mode
+wasn't deinitialized, and the nl80211 vif stays in P2P client mode.
+
+Add a new deinit_p2p_cli op (similar to deinit_ap), which currently only
+sets the interface back to station mode.
+
+Signed-hostap: Eliad Peller <eliad at wizery.com>
+intended-for: hostap-1
+(cherry picked from commit 3c29244eb7a2dfd62d80ba4e6176de2889a5dca4)
+---
+ src/drivers/driver.h | 10 ++++++++++
+ src/drivers/driver_nl80211.c | 11 +++++++++++
+ wpa_supplicant/driver_i.h | 7 +++++++
+ wpa_supplicant/p2p_supplicant.c | 5 ++++-
+ 4 files changed, 32 insertions(+), 1 deletion(-)
+
+--- a/src/drivers/driver.h
++++ b/src/drivers/driver.h
+@@ -1958,6 +1958,16 @@ struct wpa_driver_ops {
+ int (*deinit_ap)(void *priv);
+
+ /**
++ * deinit_p2p_cli - Deinitialize P2P client mode
++ * @priv: Private driver interface data
++ * Returns: 0 on success, -1 on failure (or if not supported)
++ *
++ * This optional function can be used to disable P2P client mode. It
++ * can be used to change the interface type back to station mode.
++ */
++ int (*deinit_p2p_cli)(void *priv);
++
++ /**
+ * suspend - Notification on system suspend/hibernate event
+ * @priv: Private driver interface data
+ */
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -7244,6 +7244,16 @@ static int wpa_driver_nl80211_deinit_ap(
+ }
+
+
++static int wpa_driver_nl80211_deinit_p2p_cli(void *priv)
++{
++ struct i802_bss *bss = priv;
++ struct wpa_driver_nl80211_data *drv = bss->drv;
++ if (drv->nlmode != NL80211_IFTYPE_P2P_CLIENT)
++ return -1;
++ return wpa_driver_nl80211_set_mode(priv, NL80211_IFTYPE_STATION);
++}
++
++
+ static void wpa_driver_nl80211_resume(void *priv)
+ {
+ struct i802_bss *bss = priv;
+@@ -7733,6 +7743,7 @@ const struct wpa_driver_ops wpa_driver_n
+ wpa_driver_nl80211_cancel_remain_on_channel,
+ .probe_req_report = wpa_driver_nl80211_probe_req_report,
+ .deinit_ap = wpa_driver_nl80211_deinit_ap,
++ .deinit_p2p_cli = wpa_driver_nl80211_deinit_p2p_cli,
+ .resume = wpa_driver_nl80211_resume,
+ .send_ft_action = nl80211_send_ft_action,
+ .signal_monitor = nl80211_signal_monitor,
+--- a/wpa_supplicant/driver_i.h
++++ b/wpa_supplicant/driver_i.h
+@@ -433,6 +433,13 @@ static inline int wpa_drv_deinit_ap(stru
+ return 0;
+ }
+
++static inline int wpa_drv_deinit_p2p_cli(struct wpa_supplicant *wpa_s)
++{
++ if (wpa_s->driver->deinit_p2p_cli)
++ return wpa_s->driver->deinit_p2p_cli(wpa_s->drv_priv);
++ return 0;
++}
++
+ static inline void wpa_drv_suspend(struct wpa_supplicant *wpa_s)
+ {
+ if (wpa_s->driver->suspend)
+--- a/wpa_supplicant/p2p_supplicant.c
++++ b/wpa_supplicant/p2p_supplicant.c
+@@ -316,7 +316,10 @@ static void wpas_p2p_group_delete(struct
+ wpa_printf(MSG_DEBUG, "P2P: Temporary group network not "
+ "found");
+ }
+- wpa_supplicant_ap_deinit(wpa_s);
++ if (wpa_s->ap_iface)
++ wpa_supplicant_ap_deinit(wpa_s);
++ else
++ wpa_drv_deinit_p2p_cli(wpa_s);
+ }
+
+
Added: wpa/trunk/debian/patches/upstream/0068-P2P-Notify-about-disconnection-only-when-needed.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0068-P2P-Notify-about-disconnection-only-when-needed.patch?rev=1717&op=file
==============================================================================
--- wpa/trunk/debian/patches/upstream/0068-P2P-Notify-about-disconnection-only-when-needed.patch (added)
+++ wpa/trunk/debian/patches/upstream/0068-P2P-Notify-about-disconnection-only-when-needed.patch Fri Apr 13 21:36:26 2012
@@ -1,0 +1,28 @@
+From 1ddbf356ecacf60333c43589b314fde0c0966f57 Mon Sep 17 00:00:00 2001
+From: Eliad Peller <eliad at wizery.com>
+Date: Sun, 1 Apr 2012 21:49:03 +0300
+Subject: [PATCH 68/73] P2P: Notify about disconnection only when needed
+
+wpas_notify_state_changed() notified about disconnection when
+new_state < WPA_ASSOCIATED, without checking the old state. This
+results in extra processing which can be avoided by checking that
+old_state was connected.
+
+Signed-hostap: Eliad Peller <eliad at wizery.com>
+intended-for: hostap-1
+(cherry picked from commit dbe7aa222510c6f02e7813cc6ea0cdf84d3fec9c)
+---
+ wpa_supplicant/notify.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/wpa_supplicant/notify.c
++++ b/wpa_supplicant/notify.c
+@@ -88,7 +88,7 @@ void wpas_notify_state_changed(struct wp
+ #ifdef CONFIG_P2P
+ if (new_state == WPA_COMPLETED)
+ wpas_p2p_notif_connected(wpa_s);
+- else if (new_state < WPA_ASSOCIATED)
++ else if (old_state >= WPA_ASSOCIATED && new_state < WPA_ASSOCIATED)
+ wpas_p2p_notif_disconnected(wpa_s);
+ #endif /* CONFIG_P2P */
+
Added: wpa/trunk/debian/patches/upstream/0069-Change-reason-code-for-AP-mode-BSS-termination-to-3.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0069-Change-reason-code-for-AP-mode-BSS-termination-to-3.patch?rev=1717&op=file
==============================================================================
--- wpa/trunk/debian/patches/upstream/0069-Change-reason-code-for-AP-mode-BSS-termination-to-3.patch (added)
+++ wpa/trunk/debian/patches/upstream/0069-Change-reason-code-for-AP-mode-BSS-termination-to-3.patch Fri Apr 13 21:36:26 2012
@@ -1,0 +1,80 @@
+From 35df7518d87394c46ca80d55ca6277810e09d546 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <jouni at qca.qualcomm.com>
+Date: Tue, 3 Apr 2012 16:17:38 +0300
+Subject: [PATCH 69/73] Change reason code for AP mode BSS termination to 3
+
+Use reason code 3 (Deauthenticated because sending STA is leaving)
+instead of reason code 2 (Previous authentication ot valid) in the
+Deauthentication frame sent at the time a BSS is terminated. This is
+more accurate reason for the message and allows the stations to get
+better understand on why they were disconnected. This can be useful
+especially for P2P clients that can use this as a signal that the
+P2P group session was ended per P2P specification section 3.2.9.
+
+Signed-hostap: Jouni Malinen <jouni at qca.qualcomm.com>
+(cherry picked from commit 52b2004285a82074ce74ff66230d61c2253d54f6)
+
+Conflicts:
+
+ src/ap/hostapd.c
+---
+ src/ap/hostapd.c | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+--- a/src/ap/hostapd.c
++++ b/src/ap/hostapd.c
+@@ -38,7 +38,7 @@
+ #include "p2p_hostapd.h"
+
+
+-static int hostapd_flush_old_stations(struct hostapd_data *hapd);
++static int hostapd_flush_old_stations(struct hostapd_data *hapd, u16 reason);
+ static int hostapd_setup_encryption(char *iface, struct hostapd_data *hapd);
+ static int hostapd_broadcast_wep_clear(struct hostapd_data *hapd);
+
+@@ -111,7 +111,8 @@ int hostapd_reload_config(struct hostapd
+ * allow them to use the BSS anymore.
+ */
+ for (j = 0; j < iface->num_bss; j++) {
+- hostapd_flush_old_stations(iface->bss[j]);
++ hostapd_flush_old_stations(iface->bss[j],
++ WLAN_REASON_PREV_AUTH_NOT_VALID);
+ hostapd_broadcast_wep_clear(iface->bss[j]);
+
+ #ifndef CONFIG_NO_RADIUS
+@@ -337,7 +338,7 @@ static int hostapd_setup_encryption(char
+ }
+
+
+-static int hostapd_flush_old_stations(struct hostapd_data *hapd)
++static int hostapd_flush_old_stations(struct hostapd_data *hapd, u16 reason)
+ {
+ int ret = 0;
+ u8 addr[ETH_ALEN];
+@@ -352,7 +353,7 @@ static int hostapd_flush_old_stations(st
+ }
+ wpa_printf(MSG_DEBUG, "Deauthenticate all stations");
+ os_memset(addr, 0xff, ETH_ALEN);
+- hostapd_drv_sta_deauth(hapd, addr, WLAN_REASON_PREV_AUTH_NOT_VALID);
++ hostapd_drv_sta_deauth(hapd, addr, reason);
+ hostapd_free_stas(hapd);
+
+ return ret;
+@@ -522,7 +523,7 @@ static int hostapd_setup_bss(struct host
+ if (conf->wmm_enabled < 0)
+ conf->wmm_enabled = hapd->iconf->ieee80211n;
+
+- hostapd_flush_old_stations(hapd);
++ hostapd_flush_old_stations(hapd, WLAN_REASON_PREV_AUTH_NOT_VALID);
+ hostapd_set_privacy(hapd, 0);
+
+ hostapd_broadcast_wep_clear(hapd);
+@@ -876,7 +877,7 @@ void hostapd_interface_deinit(struct hos
+ for (j = 0; j < iface->num_bss; j++) {
+ struct hostapd_data *hapd = iface->bss[j];
+ hostapd_free_stas(hapd);
+- hostapd_flush_old_stations(hapd);
++ hostapd_flush_old_stations(hapd, WLAN_REASON_DEAUTH_LEAVING);
+ hostapd_cleanup(hapd);
+ }
+ }
Added: wpa/trunk/debian/patches/upstream/0070-Save-bgscan-parameter-into-configuration-file.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0070-Save-bgscan-parameter-into-configuration-file.patch?rev=1717&op=file
==============================================================================
--- wpa/trunk/debian/patches/upstream/0070-Save-bgscan-parameter-into-configuration-file.patch (added)
+++ wpa/trunk/debian/patches/upstream/0070-Save-bgscan-parameter-into-configuration-file.patch Fri Apr 13 21:36:26 2012
@@ -1,0 +1,22 @@
+From 0cba1642ae7651672e10514ae83a446ba7c3fedc Mon Sep 17 00:00:00 2001
+From: Ed Wildgoose <lists at wildgooses.com>
+Date: Fri, 6 Apr 2012 17:59:34 +0300
+Subject: [PATCH 70/73] Save bgscan parameter into configuration file
+
+Signed-off-by: Ed Wildgoose <lists at wildgooses.com>
+intended-for: hostap-1
+(cherry picked from commit af548f5320aac429043b54cc737c7895a05a1691)
+---
+ wpa_supplicant/config_file.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/wpa_supplicant/config_file.c
++++ b/wpa_supplicant/config_file.c
+@@ -527,6 +527,7 @@ static void wpa_config_write_network(FIL
+ write_pairwise(f, ssid);
+ write_group(f, ssid);
+ write_auth_alg(f, ssid);
++ STR(bgscan);
+ #ifdef IEEE8021X_EAPOL
+ write_eap(f, ssid);
+ STR(identity);
Added: wpa/trunk/debian/patches/upstream/0071-Clarify-comment-in-wpa_supplicant-defconfig.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0071-Clarify-comment-in-wpa_supplicant-defconfig.patch?rev=1717&op=file
==============================================================================
--- wpa/trunk/debian/patches/upstream/0071-Clarify-comment-in-wpa_supplicant-defconfig.patch (added)
+++ wpa/trunk/debian/patches/upstream/0071-Clarify-comment-in-wpa_supplicant-defconfig.patch Fri Apr 13 21:36:26 2012
@@ -1,0 +1,34 @@
+From fe1dc848aa75d567e03855cef895917f6121067e Mon Sep 17 00:00:00 2001
+From: Angie Chinchilla <angie.v.chinchilla at intel.com>
+Date: Fri, 6 Apr 2012 18:06:56 +0300
+Subject: [PATCH 71/73] Clarify comment in wpa_supplicant/defconfig
+
+I think this comment, as originally stated, says the opposite of
+what is meant. Reword to help the next guy.
+
+Signed-hostap: Angie Chinchilla <angie.v.chinchilla at intel.com>
+(cherry picked from commit 540609c55fd4b08e85029b5907188bc748ee59b2)
+---
+ wpa_supplicant/defconfig | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/wpa_supplicant/defconfig
++++ b/wpa_supplicant/defconfig
+@@ -411,7 +411,7 @@ CONFIG_PEERKEY=y
+ # This tracks use of memory allocations and other registrations and reports
+ # incorrect use with a backtrace of call (or allocation) location.
+ #CONFIG_WPA_TRACE=y
+-# For BSD, comment out these.
++# For BSD, uncomment these.
+ #LIBS += -lexecinfo
+ #LIBS_p += -lexecinfo
+ #LIBS_c += -lexecinfo
+@@ -420,7 +420,7 @@ CONFIG_PEERKEY=y
+ # This enables use of libbfd to get more detailed symbols for the backtraces
+ # generated by CONFIG_WPA_TRACE=y.
+ #CONFIG_WPA_TRACE_BFD=y
+-# For BSD, comment out these.
++# For BSD, uncomment these.
+ #LIBS += -lbfd -liberty -lz
+ #LIBS_p += -lbfd -liberty -lz
+ #LIBS_c += -lbfd -liberty -lz
Added: wpa/trunk/debian/patches/upstream/0072-P2P-Fix-crash-for-failure-case-when-WSC-PIN-is-enter.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0072-P2P-Fix-crash-for-failure-case-when-WSC-PIN-is-enter.patch?rev=1717&op=file
==============================================================================
--- wpa/trunk/debian/patches/upstream/0072-P2P-Fix-crash-for-failure-case-when-WSC-PIN-is-enter.patch (added)
+++ wpa/trunk/debian/patches/upstream/0072-P2P-Fix-crash-for-failure-case-when-WSC-PIN-is-enter.patch Fri Apr 13 21:36:26 2012
@@ -1,0 +1,74 @@
+From c4ac8fdc310a4bc31cf45219fcb09de09f7137dd Mon Sep 17 00:00:00 2001
+From: Angie Chinchilla <angie.v.chinchilla at intel.com>
+Date: Fri, 6 Apr 2012 18:22:03 +0300
+Subject: [PATCH 72/73] P2P: Fix crash for failure case when WSC PIN is
+ entered incorrectly
+
+When forming a P2P group using WSC PIN method, if the PIN is entered
+incorrectly the P2P client supplicant instance will crash as a result
+of cleanup happening on data that is still in use in a case where a
+separate P2P group interface is used.
+
+For example, here is the path for the first crash:
+eap_wsc_process():
+- creates struct wpabuf tmpbuf; on the stack
+- sets data->in_buf = &tmpbuf;
+- calls wps_process_msg()
+- which calls wps_process_wsc_msg()
+- which, in case WPS_M4: calls wps_fail_event()
+- which calls wps->event_cb()
+- wps->event_cb = wpa_supplicant_wps_event()
+- wpa_supplicant_wps_event()
+- wpa_supplicant_wps_event_fail()
+- which calls wpas_clear_wps()
+- which calls wpas_notify_network_removed()
+- which calls wpas_p2p_network_removed()
+- which calls wpas_p2p_group_formation_timeout()
+- which calls wpas_group_formation_completed()
+- which calls wpas_p2p_group_delete()
+- which calls wpa_supplicant_remove_iface()
+- which calls wpa_supplicant_deinit_iface()
+- which calls wpa_supplicant_cleanup()
+- which calls eapol_sm_deinit()
+- ... which eventually uses the ptr data->in_buf to free tmpbuf, our
+stack variable and then the supplicant crashes
+
+If you fix this crash, you'll hit another. Fix it and then a segfault.
+The way we're cleaning up and deleting data from under ourselves here
+just isn't safe, so make the teardown portion of this async.
+
+Signed-hostap: Angie Chinchilla <angie.v.chinchilla at intel.com>
+Signed-hostap: Nirav Shah <nirav.j2.shah at intel.com>
+intended-for: hostap-1
+(cherry picked from commit eb6f8c2bd4f944c972ff09ecb592e6dc19d3d895)
+---
+ wpa_supplicant/p2p_supplicant.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+--- a/wpa_supplicant/p2p_supplicant.c
++++ b/wpa_supplicant/p2p_supplicant.c
+@@ -4419,14 +4419,22 @@ int wpas_p2p_in_progress(struct wpa_supp
+
+ void wpas_p2p_network_removed(struct wpa_supplicant *wpa_s,
+ struct wpa_ssid *ssid)
+-
+ {
+ if (wpa_s->p2p_in_provisioning && ssid->p2p_group &&
+ eloop_cancel_timeout(wpas_p2p_group_formation_timeout,
+ wpa_s->parent, NULL) > 0) {
++ /**
++ * Remove the network by scheduling the group formation
++ * timeout to happen immediately. The teardown code
++ * needs to be scheduled to run asynch later so that we
++ * don't delete data from under ourselves unexpectedly.
++ * Calling wpas_p2p_group_formation_timeout directly
++ * causes a series of crashes in WPS failure scenarios.
++ */
+ wpa_printf(MSG_DEBUG, "P2P: Canceled group formation due to "
+ "P2P group network getting removed");
+- wpas_p2p_group_formation_timeout(wpa_s->parent, NULL);
++ eloop_register_timeout(0, 0, wpas_p2p_group_formation_timeout,
++ wpa_s->parent, NULL);
+ }
+ }
+
Added: wpa/trunk/debian/patches/upstream/0073-P2P-Disconnect-P2P-group-on-supplicant-deinit.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/upstream/0073-P2P-Disconnect-P2P-group-on-supplicant-deinit.patch?rev=1717&op=file
==============================================================================
--- wpa/trunk/debian/patches/upstream/0073-P2P-Disconnect-P2P-group-on-supplicant-deinit.patch (added)
+++ wpa/trunk/debian/patches/upstream/0073-P2P-Disconnect-P2P-group-on-supplicant-deinit.patch Fri Apr 13 21:36:26 2012
@@ -1,0 +1,45 @@
+From fee70d7d7c4c488094aae3b6d3e13118b7370687 Mon Sep 17 00:00:00 2001
+From: Nirav Shah <nirav.j2.shah at intel.com>
+Date: Fri, 6 Apr 2012 18:41:06 +0300
+Subject: [PATCH 73/73] P2P: Disconnect P2P group on supplicant deinit
+
+When a supplicant is deinited and shutting, disconnect from P2P groups.
+This fixes a memory leak on variable dbus_groupobj_path on exiting
+supplicant.
+
+Signed-hostap: Nirav Shah <nirav.j2.shah at intel.com>
+Signed-hostap: Angie Chinchilla <angie.v.chinchilla at intel.com>
+(cherry picked from commit 103b8f4dea947df496080f646a8a955d24fcdb3d)
+
+Conflicts:
+
+ wpa_supplicant/p2p_supplicant.c
+---
+ wpa_supplicant/p2p_supplicant.c | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+--- a/wpa_supplicant/p2p_supplicant.c
++++ b/wpa_supplicant/p2p_supplicant.c
+@@ -2433,7 +2433,6 @@ void wpas_p2p_deinit(struct wpa_supplica
+ void wpas_p2p_deinit_global(struct wpa_global *global)
+ {
+ struct wpa_supplicant *wpa_s, *tmp;
+- char *ifname;
+
+ if (global->p2p == NULL)
+ return;
+@@ -2454,12 +2453,9 @@ void wpas_p2p_deinit_global(struct wpa_g
+ }
+ if (tmp == NULL)
+ break;
+- ifname = os_strdup(tmp->ifname);
+ type = wpas_p2p_if_type(tmp->p2p_group_interface);
+- wpa_supplicant_remove_iface(global, tmp);
+- if (ifname)
+- wpa_drv_if_remove(wpa_s, type, ifname);
+- os_free(ifname);
++ /* Disconnect from the P2P group and deinit the interface */
++ wpas_p2p_disconnect(tmp);
+ }
+
+ /*
More information about the Pkg-wpa-devel
mailing list