OSDN Git Service
Dmitry Shmidt [Mon, 3 Dec 2012 23:08:10 +0000 (15:08 -0800)]
Accumulative patch from commit
f5f37d3a4fc2df2a24676b4f95afca15ed793cba
Author: Jouni Malinen <j@w1.fi>
Date: Sun Nov 25 22:05:32 2012 +0200
Fix REAUTHENTICATE command after PMKSA caching
The current PMKSA cache entry needs to be clear to allow EAPOL
reauthentication to be started in case this association used PMKSA
caching.
- Remove old WPS_OOB NCF
- WPS: Add preliminary NFC connection handover support for Enrollee
- WPS: Reenable the networks disabled during wpa_wpas_reassoc
- P2P: Avoid multi-channel scans when they are not needed
- P2P: Allow discoverable interval for p2p_find to be configured
- P2P: Allow all channels with multi-channel concurrency
- Bonjour changes
- Remove disassociate
- HS 2.0 changes
- Add preliminary support for using SQLite for eap_user database
- Add SAE support
- Add disallow_aps parameter to disallow BSSIDs/SSIDs
Change-Id: I85358a05b39d46b8db49acdad667e771c580b05c
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Mike J. Chen [Fri, 7 Dec 2012 07:21:31 +0000 (23:21 -0800)]
am
0fb73406: am
0cc49e8d: Add BOARD_WLAN_DEVICE=mrvl check for ANDROID_P2P support
* commit '
0fb734060951ad2513680f2d9f9013ff68c2772e':
Add BOARD_WLAN_DEVICE=mrvl check for ANDROID_P2P support
Mike J. Chen [Fri, 7 Dec 2012 02:58:14 +0000 (18:58 -0800)]
am
0cc49e8d: Add BOARD_WLAN_DEVICE=mrvl check for ANDROID_P2P support
* commit '
0cc49e8db007f71888bf706420edfc530cf4fbff':
Add BOARD_WLAN_DEVICE=mrvl check for ANDROID_P2P support
Mike J. Chen [Wed, 5 Dec 2012 19:20:29 +0000 (11:20 -0800)]
Add BOARD_WLAN_DEVICE=mrvl check for ANDROID_P2P support
Change-Id: I5cfe2a1b66c0bb4fe5266e1bdd3fd929905ef520
Signed-off-by: Mike J. Chen <mjchen@google.com>
Jouni Malinen [Fri, 23 Nov 2012 15:05:47 +0000 (17:05 +0200)]
Android: Force group access to ctrl_iface directory
wpa_supplicant is started from /init.*.rc on Android and that seems
to be using umask 0077 which would leave the control interface
directory without group access. This breaks things since Wi-Fi
framework assumes that this directory can be accessed by other
applications in the wifi group. Fix this by adding group access even
if umask value would prevent this.
In most cases, this issue was not hit since the control interface
directory is normally created by that same init.*.rc file with suitable
mode and wpa_supplicant is killed in the way that does not allow it to
remove the file. However, if wpa_supplicant is allowed stop cleanly, it
will remove the directory and the next start could result with the Wi-Fi
framework not being able to use Wi-Fi (and GUI not showing Wi-Fi getting
enabled).
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
Ying Wang [Wed, 21 Nov 2012 20:28:46 +0000 (12:28 -0800)]
resolved conflicts for merge of
d3501922 to master
Change-Id: I1a934ce39a06fa30d3461b19cfe375400642ea4b
Ying Wang [Wed, 21 Nov 2012 19:44:33 +0000 (11:44 -0800)]
Merge "Include the subdir Android.mks in fixed order."
Ying Wang [Wed, 21 Nov 2012 02:04:25 +0000 (18:04 -0800)]
Include the subdir Android.mks in fixed order.
The build fails when the include order is reversed.
On the other hand, the build system doesn't guarantee the file order
returned by all-subdir-makefiles.
Change-Id: I398e536fc8189d0f26ebc0b0342c778d234532ad
Conflicts:
Android.mk
Ying Wang [Wed, 21 Nov 2012 02:04:25 +0000 (18:04 -0800)]
Include the subdir Android.mks in fixed order.
The build fails when the include order is reversed.
On the other hand, the build system doesn't guarantee the file order
returned by all-subdir-makefiles.
Change-Id: I398e536fc8189d0f26ebc0b0342c778d234532ad
Kenny Root [Wed, 14 Nov 2012 23:27:34 +0000 (15:27 -0800)]
am
56388dbb: Merge "Switch keystore to binder"
* commit '
56388dbb276fef1e0ccdfcd5a38ab9b946bb3734':
Switch keystore to binder
Kenny Root [Wed, 14 Nov 2012 22:17:37 +0000 (14:17 -0800)]
Merge "Switch keystore to binder"
Kenny Root [Tue, 13 Nov 2012 00:33:36 +0000 (16:33 -0800)]
Switch keystore to binder
Change-Id: Idfcff5f2799863075160cc6c2565f2fe774c2552
Dmitry Shmidt [Wed, 7 Nov 2012 20:58:02 +0000 (12:58 -0800)]
wpa_supplicant: Set Ver 0.8.X as default
Change-Id: I2d2433464068e863c12c0a06eed269e2a8c0fc46
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
The Android Open Source Project [Tue, 6 Nov 2012 20:29:09 +0000 (12:29 -0800)]
am
600a7278: (-s ours) am
c0aec062: am
930540de: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
600a72784d7e928167ad0865d6ef2b2fd62a31db':
The Android Open Source Project [Tue, 6 Nov 2012 20:24:32 +0000 (12:24 -0800)]
am
c0aec062: am
930540de: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
c0aec06214be674ced7106461e9f19c127fb1c70':
The Android Open Source Project [Tue, 6 Nov 2012 20:20:27 +0000 (12:20 -0800)]
am
930540de: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
930540de4415795500e22f02bb707768b7742fc6':
P2P: Fix network removal to select correct block
wpa_supplicant: Postpone P2P scan if usual scan is in progress
The Android Open Source Project [Tue, 6 Nov 2012 20:16:51 +0000 (12:16 -0800)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Ibb893211cd723e60db60b80a3da19c58575461e2
The Android Open Source Project [Thu, 1 Nov 2012 14:54:39 +0000 (07:54 -0700)]
am
19409cd0: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
19409cd098ff01560443298f40652953222da067':
The Android Open Source Project [Thu, 1 Nov 2012 14:51:53 +0000 (07:51 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Id8e9b62ec7d117c1b6bdbeb739be7148f15f31cb
The Android Automerger [Thu, 1 Nov 2012 01:33:52 +0000 (18:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Irfan Sheriff [Wed, 31 Oct 2012 20:20:01 +0000 (13:20 -0700)]
am
5d7d6ace: am
efb9743f: am
86c93df1: Merge "Increase timeouts for p2p" into jb-mr1-dev
* commit '
5d7d6ace05e310115d13fe31d68a218c7f20c18c':
Increase timeouts for p2p
Irfan Sheriff [Wed, 31 Oct 2012 20:18:26 +0000 (13:18 -0700)]
am
efb9743f: am
86c93df1: Merge "Increase timeouts for p2p" into jb-mr1-dev
* commit '
efb9743f24044390273be6722656c2bf3ffddc7d':
Increase timeouts for p2p
Irfan Sheriff [Wed, 31 Oct 2012 20:15:58 +0000 (13:15 -0700)]
am
86c93df1: Merge "Increase timeouts for p2p" into jb-mr1-dev
* commit '
86c93df1d626c42147db2f2a6dfb5dcad83477ec':
Increase timeouts for p2p
Irfan Sheriff [Wed, 31 Oct 2012 20:14:21 +0000 (13:14 -0700)]
Merge "Increase timeouts for p2p" into jb-mr1-dev
The Android Open Source Project [Wed, 31 Oct 2012 16:19:09 +0000 (09:19 -0700)]
am
af40b4e5: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
af40b4e5a4778313433ce9612c51ba367acf8d66':
The Android Open Source Project [Wed, 31 Oct 2012 16:16:28 +0000 (09:16 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I99d44c2e57eba3b98e5d217591968559fa3d1fe3
Irfan Sheriff [Wed, 31 Oct 2012 05:22:52 +0000 (22:22 -0700)]
Increase timeouts for p2p
Dongles can be slow to respond and a quick turn around time on packets does not help.
Allow for upto 350ms on retry attempts for provision discovery, negotiation and invitation
This will catch slow responses within the first attempt and prevent any kind of issues
with sequence number handling
Bug:
7445415
Change-Id: I88a849d400b10f42ac298bad6d01f49803fcc8ba
Sasha Levitskiy [Tue, 30 Oct 2012 17:11:18 +0000 (10:11 -0700)]
am
f368213f: am
a27072d9: am
b8fdecbf: Add parameter checking and error reporting to wpa_blacklist API.
* commit '
f368213fa92b11482f0d5807dc149f405dd8e62f':
Add parameter checking and error reporting to wpa_blacklist API.
Dmitry Shmidt [Tue, 30 Oct 2012 17:11:14 +0000 (10:11 -0700)]
am
f210a2f4: am
d73deeec: am
54cb0f6f: wpa_supplicant: Try to reject proper BSSID even if not set by the driver
* commit '
f210a2f498f4854bb00528b9167c5f0d17c37f75':
wpa_supplicant: Try to reject proper BSSID even if not set by the driver
The Android Automerger [Tue, 30 Oct 2012 15:52:30 +0000 (08:52 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Sasha Levitskiy [Mon, 29 Oct 2012 23:54:11 +0000 (16:54 -0700)]
am
a27072d9: am
b8fdecbf: Add parameter checking and error reporting to wpa_blacklist API.
* commit '
a27072d9cc9ca8ee39cc4d8d645f6b0721ba5c8e':
Add parameter checking and error reporting to wpa_blacklist API.
Sasha Levitskiy [Mon, 29 Oct 2012 23:52:36 +0000 (16:52 -0700)]
am
b8fdecbf: Add parameter checking and error reporting to wpa_blacklist API.
* commit '
b8fdecbfd0a0cdbbb17b902a6be87c84227b9b11':
Add parameter checking and error reporting to wpa_blacklist API.
Sasha Levitskiy [Thu, 25 Oct 2012 22:07:02 +0000 (15:07 -0700)]
Add parameter checking and error reporting to wpa_blacklist API.
Bug:
7423119
Change-Id: Iae85361aa0dc94a75bffd07deef451c85e3d9d96
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Dmitry Shmidt [Mon, 29 Oct 2012 23:14:06 +0000 (16:14 -0700)]
am
d73deeec: am
54cb0f6f: wpa_supplicant: Try to reject proper BSSID even if not set by the driver
* commit '
d73deeecfe9764334b4d151d65d2989de65a9094':
wpa_supplicant: Try to reject proper BSSID even if not set by the driver
Dmitry Shmidt [Mon, 29 Oct 2012 23:11:25 +0000 (16:11 -0700)]
am
54cb0f6f: wpa_supplicant: Try to reject proper BSSID even if not set by the driver
* commit '
54cb0f6fef5a8ffe2dc7ed98b274fe81ca84c431':
wpa_supplicant: Try to reject proper BSSID even if not set by the driver
Dmitry Shmidt [Mon, 29 Oct 2012 20:12:24 +0000 (13:12 -0700)]
wpa_supplicant: Try to reject proper BSSID even if not set by the driver
Bug:
7423119
Change-Id: Id0266274c9c60f8eea872ca3cfa5ad40d9180789
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
The Android Automerger [Tue, 23 Oct 2012 23:46:53 +0000 (16:46 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jeff Johnson [Tue, 23 Oct 2012 21:55:18 +0000 (14:55 -0700)]
am
dc4a9a1c: am
03df168d: am
b485b188: Add better handling of CTRL-EVENT-ASSOC-REJECT
* commit '
dc4a9a1cc479eb06ca7610821aeb126fa1bfec31':
Add better handling of CTRL-EVENT-ASSOC-REJECT
Jeff Johnson [Tue, 23 Oct 2012 21:52:56 +0000 (14:52 -0700)]
am
03df168d: am
b485b188: Add better handling of CTRL-EVENT-ASSOC-REJECT
* commit '
03df168d17437b6221a3f42876126974322f4e58':
Add better handling of CTRL-EVENT-ASSOC-REJECT
Jeff Johnson [Tue, 23 Oct 2012 21:50:48 +0000 (14:50 -0700)]
am
b485b188: Add better handling of CTRL-EVENT-ASSOC-REJECT
* commit '
b485b188f853a4ec5342c2ea49705b545b2caf3d':
Add better handling of CTRL-EVENT-ASSOC-REJECT
Jeff Johnson [Mon, 22 Oct 2012 01:19:27 +0000 (18:19 -0700)]
Add better handling of CTRL-EVENT-ASSOC-REJECT
In an enterprise environment a given Access Point (AP) may reject an
association request due to load balancing. In an enterprise with a
congested Wi-Fi network we may have to connect to many APs before we
find one that will accept the connection. Currently when the
wpa_supplicant receives a CTRL-EVENT-ASSOC-REJECT it will continue to
count down the 10 second authentication timer, and doesn't realize
that it should now attempt to find a different AP. Fix this issue in
multiple ways. First, we increase the number of association rejects
we handle before we disable the network. This will allow us more
opportunity to authenticate with other APs which are sharing the same
SSID. Second, when we are rejected we immediately blacklist the AP
and rescan so that we can immediately attempt to connect to other APs.
Bug:
7329568
Change-Id: I0ff66a0e05e6d4a9dec3dea98eccd850ecd5e343
The Android Automerger [Wed, 17 Oct 2012 23:07:03 +0000 (16:07 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jeff Johnson [Wed, 17 Oct 2012 21:18:10 +0000 (14:18 -0700)]
am
c9330050: am
a44422be: am
12b1cd9e: Support conc_pref when use_p2p_group_interface=0
* commit '
c9330050e31b548cf2df57b77cdf2ceb7b0d70ec':
Support conc_pref when use_p2p_group_interface=0
Jeff Johnson [Wed, 17 Oct 2012 21:16:10 +0000 (14:16 -0700)]
am
a44422be: am
12b1cd9e: Support conc_pref when use_p2p_group_interface=0
* commit '
a44422be5306577189c7df272d3615129551b22e':
Support conc_pref when use_p2p_group_interface=0
Jeff Johnson [Wed, 17 Oct 2012 21:13:09 +0000 (14:13 -0700)]
am
12b1cd9e: Support conc_pref when use_p2p_group_interface=0
* commit '
12b1cd9e151d1e5c4d35aa38531f38b4ef5cc805':
Support conc_pref when use_p2p_group_interface=0
Jeff Johnson [Mon, 8 Oct 2012 02:34:24 +0000 (19:34 -0700)]
Support conc_pref when use_p2p_group_interface=0
The original implementation of wpas_p2p_handle_frequency_conflicts()
only works correctly when P2P groups use a separate interface
(i.e. use_p2p_group_interface=1). Update the implementation so
that it also works when the device interfaces is used
(i.e. use_p2p_group_interface=0).
Bug:
7290509
Change-Id: Icbc489125c5b7bd6e174d6aecd53555cdc9ad99d
The Android Automerger [Wed, 17 Oct 2012 13:59:20 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Irfan Sheriff [Wed, 17 Oct 2012 05:59:55 +0000 (22:59 -0700)]
am
1449e2b6: am
f1b71881: am
81931b8b: Increase channel delay to 100ms
* commit '
1449e2b6a4b40abcd1fc7e5f5458bfbfec8c89a5':
Increase channel delay to 100ms
Irfan Sheriff [Wed, 17 Oct 2012 05:57:49 +0000 (22:57 -0700)]
am
f1b71881: am
81931b8b: Increase channel delay to 100ms
* commit '
f1b7188187968e37abf9e4ac2e82c4ab08577d2a':
Increase channel delay to 100ms
Irfan Sheriff [Wed, 17 Oct 2012 05:55:47 +0000 (22:55 -0700)]
am
81931b8b: Increase channel delay to 100ms
* commit '
81931b8bb302c38828763358f9e15af2b22c52c6':
Increase channel delay to 100ms
Irfan Sheriff [Wed, 17 Oct 2012 04:40:46 +0000 (21:40 -0700)]
Increase channel delay to 100ms
There is an inherent flaw in the p2p protocol design where an ACK loss right
before channel switch leads to peers being out of sync.
A work around of 50ms was added persistent case, but it turns out in heavy lossy
conditions that is not enough. Increase it to 100ms.
Experimental evaluation showed 100ms improves the reliability of p2p persistence
reinvocation.
Bug:
7359500
Change-Id: I73ab1b64e32b87101e95b0e487c90818c2c0aaf3
The Android Automerger [Mon, 15 Oct 2012 19:30:44 +0000 (12:30 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Open Source Project [Mon, 15 Oct 2012 14:40:25 +0000 (07:40 -0700)]
am
d5d59275: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
d5d5927584ce77872dfd070bb3c6558cf6fd441d':
The Android Open Source Project [Mon, 15 Oct 2012 14:38:31 +0000 (07:38 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I1253d2b70d2ba5be1771d5824386c8c42bdbdf0f
The Android Automerger [Mon, 15 Oct 2012 13:59:11 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jouni Malinen [Sun, 14 Oct 2012 20:07:22 +0000 (13:07 -0700)]
am
6c59bc14: am
532a21e6: am
2c5b17df: P2P: Improve robustness against lost ctrl::ack
* commit '
6c59bc140981a064431fc8555d78de7d539d9b0c':
P2P: Improve robustness against lost ctrl::ack
Jouni Malinen [Sun, 14 Oct 2012 20:05:43 +0000 (13:05 -0700)]
am
532a21e6: am
2c5b17df: P2P: Improve robustness against lost ctrl::ack
* commit '
532a21e653c99b23c904f21f9a31325eca450690':
P2P: Improve robustness against lost ctrl::ack
Jouni Malinen [Sun, 14 Oct 2012 20:04:12 +0000 (13:04 -0700)]
am
2c5b17df: P2P: Improve robustness against lost ctrl::ack
* commit '
2c5b17df4c29abdf11a85216c2f6272af796c576':
P2P: Improve robustness against lost ctrl::ack
Jouni Malinen [Sun, 14 Oct 2012 04:52:46 +0000 (21:52 -0700)]
P2P: Improve robustness against lost ctrl::ack
P2P includes two use cases where one of the devices is going to start a
group and likely change channels immediately after processing a frame.
This operation may be fast enough to make the device leave the current
channel before the peer has completed layer 2 retransmission of the
frame in case the ctrl::ack frame was lost. This can result in the peer
not getting TX status success notification.
For GO Negotiation Confirm frame, p2p_go_neg_conf_cb() has a workaround
that ignores the TX status failure and will continue with the group
formation with the assumption that the peer actually received the frame
even though we did not receive ctrl::ack. For Invitation Response frame
to re-invoke a persistent group, no such workaround is used in
p2p_invitation_resp_cb(). Consequently, TX status failure due to lost
ctrl::ack frame results in one of the peers not starting the group.
Increase the likelihood of layer 2 retransmission getting acknowledged
and ctrl::ack being received by waiting a short duration after having
processed the GO Negotiation Confirm and Invitation Response frames for
the re-invocation case. For the former, use 20 ms wait since this case
has been worked around in deployed devices. For the latter, use 50 ms
wait to get even higher likelihood of getting ctrl::ack through since
deployed devices (and the current wpa_supplicant implementation) do not
have a workaround to ignore TX status failure.
20 ms is long enough to include at least couple of retries and that
should increase likelihood of getting ctrl::ack through quite a bit. The
longer 50 ms wait is likely to include full set of layer 2 retries.
Bug:
7282991
Change-Id: If063895046ff42fb52579bfb386281085bedce58
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
The Android Open Source Project [Tue, 9 Oct 2012 14:31:47 +0000 (07:31 -0700)]
am
65c8df85: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
65c8df8530418c66eedb06fa13372bcd41409492':
P2P: Fix network removal to select correct block
The Android Open Source Project [Tue, 9 Oct 2012 14:29:06 +0000 (07:29 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ia76fbf94fed108207ae3cb4d53f710f81aa4311f
Jouni Malinen [Fri, 5 Oct 2012 18:01:57 +0000 (11:01 -0700)]
P2P: Fix network removal to select correct block
If wpa_s->current_ssid is not set (e.g., after disconnection that
did not result in immediate group removal), an incorrect group could
have been removed since the network block iteration here could select
the network block that is used to store persistent group credentials.
Fix this by verifying that disabled != 2 to avoid picking the network
block that could not have been the temporary P2P group.
Bug:
7290511
Change-Id: Ia61bab3e11137ab2c0c34014e4d8d8bdee2a0469
Jouni Malinen [Fri, 5 Oct 2012 18:40:19 +0000 (11:40 -0700)]
am
7c5e12ad: am
fe62849f: am
9d712833: P2P: Fix network removal to select correct block
* commit '
7c5e12ada07c2f1334b29624adc97c7b6528db52':
P2P: Fix network removal to select correct block
Jouni Malinen [Fri, 5 Oct 2012 18:38:36 +0000 (11:38 -0700)]
am
fe62849f: am
9d712833: P2P: Fix network removal to select correct block
* commit '
fe62849f4448ef74add320a067a88bce61ed0f80':
P2P: Fix network removal to select correct block
Jouni Malinen [Fri, 5 Oct 2012 18:37:16 +0000 (11:37 -0700)]
am
9d712833: P2P: Fix network removal to select correct block
* commit '
9d71283328fbad680cc74d9b287580e373eb4d6c':
P2P: Fix network removal to select correct block
Jouni Malinen [Fri, 5 Oct 2012 18:01:57 +0000 (11:01 -0700)]
P2P: Fix network removal to select correct block
If wpa_s->current_ssid is not set (e.g., after disconnection that
did not result in immediate group removal), an incorrect group could
have been removed since the network block iteration here could select
the network block that is used to store persistent group credentials.
Fix this by verifying that disabled != 2 to avoid picking the network
block that could not have been the temporary P2P group.
Bug:
7290511
Change-Id: Ia61bab3e11137ab2c0c34014e4d8d8bdee2a0469
The Android Open Source Project [Thu, 4 Oct 2012 14:49:43 +0000 (07:49 -0700)]
am
86b5c679: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
86b5c67993dea522f6cc2549c93f63b0eae05379':
The Android Open Source Project [Thu, 4 Oct 2012 14:48:00 +0000 (07:48 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I7faf49ef059f0f01586b3451426ee59d5778a25f
The Android Automerger [Thu, 4 Oct 2012 13:59:29 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jouni Malinen [Wed, 3 Oct 2012 23:34:29 +0000 (16:34 -0700)]
am
235dc89e: am
436d1e84: am
adddfc48: P2P: Fix p2p_cancel processing during group formation
* commit '
235dc89ebadbb56719e6cec838a49c3aa07b2d1b':
P2P: Fix p2p_cancel processing during group formation
Jouni Malinen [Wed, 3 Oct 2012 23:30:53 +0000 (16:30 -0700)]
am
436d1e84: am
adddfc48: P2P: Fix p2p_cancel processing during group formation
* commit '
436d1e842776ae15efe01f16f19a975177be5a88':
P2P: Fix p2p_cancel processing during group formation
Jouni Malinen [Wed, 3 Oct 2012 23:28:53 +0000 (16:28 -0700)]
am
adddfc48: P2P: Fix p2p_cancel processing during group formation
* commit '
adddfc48d2d7bfa2b1a2405ab8f404b6383ec236':
P2P: Fix p2p_cancel processing during group formation
Jouni Malinen [Wed, 3 Oct 2012 21:31:41 +0000 (14:31 -0700)]
P2P: Fix p2p_cancel processing during group formation
The wpa_s->p2p_in_provisioning flag did not get cleared in some cases
where p2p_cancel command is used to stop group formation. This can result
in some operations (like p2p_find) failing afterwards. Fix this by using
wpas_group_formation_completed() when processing p2p_cancel for a group
that has not yet completed group formation.
Bug:
7280743
Change-Id: I2dea935bd7c0509237de54bd048954f75ce80bfc
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Jean-Baptiste Queru [Wed, 3 Oct 2012 22:30:19 +0000 (15:30 -0700)]
am
4177ffd2: (-s ours) am
992b10f4: (-s ours) Reconcile with jb-dev - do not merge
* commit '
4177ffd2ab90fb8b5d5d68b804ec1916fd656d8c':
Jean-Baptiste Queru [Wed, 3 Oct 2012 22:28:02 +0000 (15:28 -0700)]
am
992b10f4: (-s ours) Reconcile with jb-dev - do not merge
* commit '
992b10f49def736e424b9d6e01130de28b09cd1f':
Jean-Baptiste Queru [Wed, 3 Oct 2012 22:25:25 +0000 (15:25 -0700)]
Reconcile with jb-dev - do not merge
Change-Id: Ie7428c559f53a12d88e9afdbd7234423881aed0f
Jean-Baptiste Queru [Fri, 28 Sep 2012 22:52:21 +0000 (15:52 -0700)]
Jean-Baptiste Queru [Fri, 28 Sep 2012 21:23:34 +0000 (14:23 -0700)]
Merge from jb-mr1-aah-dev
Change-Id: I02876a27a1466842f648489ece651c356fe9d257
The Android Open Source Project [Fri, 28 Sep 2012 07:32:31 +0000 (00:32 -0700)]
am
31dab599: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
31dab5994aac66e7e9bbe47ccaa399997d5b2d95':
The Android Open Source Project [Thu, 27 Sep 2012 16:57:44 +0000 (09:57 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I84f209a40227014231778a0b30a3d6a2c523e3e3
The Android Automerger [Thu, 27 Sep 2012 13:59:30 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Irfan Sheriff [Wed, 26 Sep 2012 21:30:10 +0000 (14:30 -0700)]
am
d5393476: am
069fa2c3: Remove unnecessary channel list filtering
* commit '
d5393476007ae204387783a016e74aea5f1a147b':
Remove unnecessary channel list filtering
Irfan Sheriff [Wed, 26 Sep 2012 21:28:49 +0000 (14:28 -0700)]
am
069fa2c3: Remove unnecessary channel list filtering
* commit '
069fa2c39ec7120656a2ea8cca83c5ee41ddab60':
Remove unnecessary channel list filtering
Irfan Sheriff [Wed, 26 Sep 2012 21:28:18 +0000 (14:28 -0700)]
am
069fa2c3: Remove unnecessary channel list filtering
* commit '
069fa2c39ec7120656a2ea8cca83c5ee41ddab60':
Remove unnecessary channel list filtering
The Android Open Source Project [Wed, 26 Sep 2012 17:07:46 +0000 (10:07 -0700)]
am
ff81427a: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
ff81427a2cd5ac877824101bec7ea50b8ad5bffb':
The Android Open Source Project [Wed, 26 Sep 2012 16:06:32 +0000 (09:06 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ice14c1907d8834bd141dc9d06ccb0d0e7f0f04d5
The Android Automerger [Wed, 26 Sep 2012 13:59:22 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Irfan Sheriff [Tue, 25 Sep 2012 06:59:04 +0000 (23:59 -0700)]
Remove unnecessary channel list filtering
Operating channel is always set even without an STA connected. Remove
channel list filtering based on that.
Channel list is filtered in the p2p_connect and p2p_invite path based
on force_freq which is essentially the operating channel for STA
This patch helps fix WifiDirect b/w two android devices for SCC while at
the same time keeping channel compliance with WFD dongle
Bug:
7232932
Change-Id: Ie9524f9e45b6f997959c3359a81b05f63b576045
Dmitry Shmidt [Tue, 25 Sep 2012 22:34:23 +0000 (15:34 -0700)]
am
82e047b1: am
91c40cdc: wpa_supplicant: P2P-related fixes
* commit '
82e047b15c0e3a5935cef15fe6461633db5d3ab4':
wpa_supplicant: P2P-related fixes
Dmitry Shmidt [Tue, 25 Sep 2012 21:51:19 +0000 (14:51 -0700)]
am
91c40cdc: wpa_supplicant: P2P-related fixes
* commit '
91c40cdce17424d9a4718876becf0b7811cf68f2':
wpa_supplicant: P2P-related fixes
Dmitry Shmidt [Tue, 25 Sep 2012 21:49:51 +0000 (14:49 -0700)]
am
91c40cdc: wpa_supplicant: P2P-related fixes
* commit '
91c40cdce17424d9a4718876becf0b7811cf68f2':
wpa_supplicant: P2P-related fixes
Dmitry Shmidt [Tue, 25 Sep 2012 21:23:53 +0000 (14:23 -0700)]
wpa_supplicant: P2P-related fixes
- P2P: Show own channel list in debug log
- P2P: Allow peer to propose channel in invitation process
- P2P: Clear sta_scan_pending on group removal
- P2P: Fix ignoring of PD Response due to dialog token mismatch
BUG:
7226065,
7231289
Change-Id: Iacb0f85d80f63bcdf311ccc0d29d0c282a0c0576
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
The Android Automerger [Tue, 25 Sep 2012 13:59:34 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Dmitry Shmidt [Mon, 24 Sep 2012 19:02:25 +0000 (12:02 -0700)]
am
03b9cf83: am
aa532510: wpa_supplicant: P2P-related fixes
* commit '
03b9cf83dbc0225d79b35319391574ec382836dd':
wpa_supplicant: P2P-related fixes
Dmitry Shmidt [Mon, 24 Sep 2012 19:01:22 +0000 (12:01 -0700)]
am
aa532510: wpa_supplicant: P2P-related fixes
* commit '
aa532510a7b8c4da2d7d6e2c11dda5db840894e4':
wpa_supplicant: P2P-related fixes
Dmitry Shmidt [Mon, 24 Sep 2012 19:01:03 +0000 (12:01 -0700)]
am
aa532510: wpa_supplicant: P2P-related fixes
* commit '
aa532510a7b8c4da2d7d6e2c11dda5db840894e4':
wpa_supplicant: P2P-related fixes
Dmitry Shmidt [Mon, 24 Sep 2012 17:35:31 +0000 (10:35 -0700)]
wpa_supplicant: P2P-related fixes
- Remove unused function warning in WPS-NFC case
- P2P: Fix p2p_ctrl_invite_persistent to parse peer parameter
- hostapd: Fix CONFIG_INTERWORKING=y build without CONFIG_HS20=y
- hostapd: Fix WDS VLAN bridge handling
- hostapd: Send EAPOL frames from the VO queue if WMM is active
- P2P: Remove channel 14 from supported P2P channels
- hostapd: Clear WLAN_STA_ASSOC_REQ_OK if sending the assoc response failed
- hostapd: Add check for the wds sta flag before creating 4addr VLANs
- nl80211: Use the monitor interface if socket tx status is not supported
- wpa_supplicant: Set state to DISCONNECTED on AP creation errors
- P2P: Fix p2p_group_idle in no-group-interface P2P client case
- P2P: Fix PSK configuration for GO network
- Print control interface commands in easier format
- Add debug print for no enabled networks case
- P2P: Add more debug prints for GO start routines
- P2P: Fix pending sta scan processing for concurrent operation cases
BUG:
6940646
Change-Id: I1b1c54a08c61ec4af2bfd2274afc93501004eea2
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
The Android Open Source Project [Mon, 24 Sep 2012 17:13:04 +0000 (10:13 -0700)]
am
e6ce5892: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
e6ce589266deddd541fe728a13dc97d661a7c121':
The Android Open Source Project [Mon, 24 Sep 2012 17:12:01 +0000 (10:12 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Idb6548913ea9c4fc31a5b79e889274e7689f52c0
Irfan Sheriff [Mon, 24 Sep 2012 16:33:02 +0000 (09:33 -0700)]
am
a1b911d3: am
f0619665: Fix build: Add ANDROID_P2P for SCC interop fixes
* commit '
a1b911d3d65ef00058cc3ce04f1f6a26ec5552b7':
Fix build: Add ANDROID_P2P for SCC interop fixes