OSDN Git Service
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: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
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: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: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: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: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: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: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: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: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: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: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 21:23:34 +0000 (14:23 -0700)]
Merge from jb-mr1-aah-dev
Change-Id: I02876a27a1466842f648489ece651c356fe9d257
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: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 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 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: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:12:01 +0000 (10:12 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Idb6548913ea9c4fc31a5b79e889274e7689f52c0
Irfan Sheriff [Mon, 24 Sep 2012 16:25:08 +0000 (09:25 -0700)]
am
f0619665: Fix build: Add ANDROID_P2P for SCC interop fixes
* commit '
f06196652a3e12af00503f4a548c56d4e60f7246':
Fix build: Add ANDROID_P2P for SCC interop fixes
Irfan Sheriff [Mon, 24 Sep 2012 16:25:08 +0000 (09:25 -0700)]
am
af84a575: GC channel fixes for better interop with SCC
* commit '
af84a575044f6556994fcc124a955fc0ac0a6736':
GC channel fixes for better interop with SCC
Irfan Sheriff [Mon, 24 Sep 2012 15:29:37 +0000 (08:29 -0700)]
am
f0619665: Fix build: Add ANDROID_P2P for SCC interop fixes
* commit '
f06196652a3e12af00503f4a548c56d4e60f7246':
Fix build: Add ANDROID_P2P for SCC interop fixes
Irfan Sheriff [Mon, 24 Sep 2012 15:29:37 +0000 (08:29 -0700)]
am
af84a575: GC channel fixes for better interop with SCC
* commit '
af84a575044f6556994fcc124a955fc0ac0a6736':
GC channel fixes for better interop with SCC
The Android Automerger [Mon, 24 Sep 2012 13:59:07 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Irfan Sheriff [Mon, 24 Sep 2012 02:11:37 +0000 (19:11 -0700)]
Fix build: Add ANDROID_P2P for SCC interop fixes
Change-Id: I847b63428b47016cf9a9a0b090636e1d5b9d28b8
The Android Automerger [Mon, 24 Sep 2012 01:59:42 +0000 (18:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Irfan Sheriff [Sat, 22 Sep 2012 23:59:30 +0000 (16:59 -0700)]
GC channel fixes for better interop with SCC
- Force operating channel as the only channel in channel list attribute for go negotiation
and persistence
- Force an operating channel in go negotiation response even if the GO indicates a different
in negotiation request
- Fix a bug with updating peer operating channel based on GO negotiation confirm
Bug:
7217600
Change-Id: I6da0dc1a49c1d99ae97dcab8ee9899e07a80a6cb
The Android Open Source Project [Thu, 20 Sep 2012 17:35:38 +0000 (10:35 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I3295bdb670882ec455141c50d2c3f71dab97af67
The Android Automerger [Sun, 16 Sep 2012 13:59:32 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jouni Malinen [Fri, 14 Sep 2012 21:30:01 +0000 (14:30 -0700)]
am
89ca702e: Do not inform other virtual interfaces of scan results in all cases
* commit '
89ca702e8ed3247d7007dbdebe531036671c34af':
Do not inform other virtual interfaces of scan results in all cases
Jouni Malinen [Fri, 14 Sep 2012 21:29:53 +0000 (14:29 -0700)]
am
89ca702e: Do not inform other virtual interfaces of scan results in all cases
* commit '
89ca702e8ed3247d7007dbdebe531036671c34af':
Do not inform other virtual interfaces of scan results in all cases
Jouni Malinen [Fri, 14 Sep 2012 21:13:57 +0000 (14:13 -0700)]
am
fa08f9eb: P2P: Schedule new scan if P2P operation delays scan
* commit '
fa08f9eb31989e0973eb8ed0bd14c238be19ab0b':
P2P: Schedule new scan if P2P operation delays scan
Jouni Malinen [Fri, 14 Sep 2012 21:13:56 +0000 (14:13 -0700)]
am
043a5a9d: P2P: Check all interfaces for pending scan for p2p_scan failures
* commit '
043a5a9d2586bf379a3f3e811c8c64d92050e131':
P2P: Check all interfaces for pending scan for p2p_scan failures
Jouni Malinen [Fri, 14 Sep 2012 21:13:56 +0000 (14:13 -0700)]
am
dc7b7132: P2P: Move p2p_cb_on_scan_complete to global context
* commit '
dc7b71324df9788e194745e8ab9386a4619a623a':
P2P: Move p2p_cb_on_scan_complete to global context
Jouni Malinen [Fri, 14 Sep 2012 21:13:53 +0000 (14:13 -0700)]
am
fa08f9eb: P2P: Schedule new scan if P2P operation delays scan
* commit '
fa08f9eb31989e0973eb8ed0bd14c238be19ab0b':
P2P: Schedule new scan if P2P operation delays scan
Jouni Malinen [Fri, 14 Sep 2012 21:13:53 +0000 (14:13 -0700)]
am
043a5a9d: P2P: Check all interfaces for pending scan for p2p_scan failures
* commit '
043a5a9d2586bf379a3f3e811c8c64d92050e131':
P2P: Check all interfaces for pending scan for p2p_scan failures
Jouni Malinen [Fri, 14 Sep 2012 21:13:49 +0000 (14:13 -0700)]
am
dc7b7132: P2P: Move p2p_cb_on_scan_complete to global context
* commit '
dc7b71324df9788e194745e8ab9386a4619a623a':
P2P: Move p2p_cb_on_scan_complete to global context
The Android Automerger [Fri, 14 Sep 2012 21:10:18 +0000 (14:10 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jouni Malinen [Fri, 14 Sep 2012 20:03:12 +0000 (13:03 -0700)]
Do not inform other virtual interfaces of scan results in all cases
If a connection operation is started on an interface based on scan
results, other virtual interfaces should not be information about the
results to avoid potential concurrent operations during the association
steps. Since the sibling notification of scan results received was added
as an optimization, skipping it for this type of cases is the simplest
way of avoiding unnecessary concurrent operations.
Change-Id: I145b4237074a97cc75fd68933fff7ed99b850630
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Jouni Malinen [Fri, 14 Sep 2012 01:05:55 +0000 (18:05 -0700)]
P2P: Schedule new scan if P2P operation delays scan
This makes sure that the interrupted station mode scan can be completed
after the P2P operations have had their chance of using the radio.
Signed-hostap: Jouni Malinen <j@w1.fi>
Jouni Malinen [Fri, 14 Sep 2012 01:03:14 +0000 (18:03 -0700)]
P2P: Check all interfaces for pending scan for p2p_scan failures
Driver could reject the new scan based on any virtual interface
running a concurrent scan. As such, mark the pending scan callback
for P2P based on any interfaces instead of just the one used for
the p2p_scan operation.
Signed-hostap: Jouni Malinen <j@w1.fi>
Jouni Malinen [Fri, 14 Sep 2012 19:53:47 +0000 (12:53 -0700)]
P2P: Move p2p_cb_on_scan_complete to global context
Since we have a global P2P module, the flag to trigger scan completion
events to it needs to be in similar context. The previous design
maintained this separately for each virtual interface and if P2P module
did not run its scan operation on the virtual interface that completed
the scan, P2P module would not be allowed to restart operations
properly.
Change-Id: I1b5a55c03aede15bbe0ac70dcbe0011a90f69b20
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Fri, 14 Sep 2012 18:27:02 +0000 (11:27 -0700)]
am
5887a9d5: wpa_supplicant: Skip unnecessary scan attempts
* commit '
5887a9d552f3d9d612011daba073e076daab5b2a':
wpa_supplicant: Skip unnecessary scan attempts
Dmitry Shmidt [Fri, 14 Sep 2012 18:26:50 +0000 (11:26 -0700)]
am
5887a9d5: wpa_supplicant: Skip unnecessary scan attempts
* commit '
5887a9d552f3d9d612011daba073e076daab5b2a':
wpa_supplicant: Skip unnecessary scan attempts
Dmitry Shmidt [Fri, 14 Sep 2012 17:47:43 +0000 (10:47 -0700)]
wpa_supplicant: Skip unnecessary scan attempts
Change-Id: Ieea8843c0fcb063dbb1df56e5cdf3fbdd0590cd4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Fri, 14 Sep 2012 17:47:37 +0000 (10:47 -0700)]
am
9bce59c7: wpa_supplicant: Update to 10-Sep-2012 TOT
* commit '
9bce59c7fef20e34a05f04d1e33a4076083dca0c':
wpa_supplicant: Update to 10-Sep-2012 TOT
Dmitry Shmidt [Fri, 14 Sep 2012 17:47:33 +0000 (10:47 -0700)]
am
9bce59c7: wpa_supplicant: Update to 10-Sep-2012 TOT
* commit '
9bce59c7fef20e34a05f04d1e33a4076083dca0c':
wpa_supplicant: Update to 10-Sep-2012 TOT
The Android Automerger [Fri, 14 Sep 2012 14:11:36 +0000 (07:11 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Dmitry Shmidt [Tue, 11 Sep 2012 22:06:38 +0000 (15:06 -0700)]
wpa_supplicant: Update to 10-Sep-2012 TOT
commit
762b99db7a76803d1ad274e87caa6fe870d47441
Author: Jouni Malinen <j@w1.fi>
Date: Mon Sep 10 12:33:29 2012 +0200
Fix last_scan_res update existing BSS entry is update
Change-Id: I03f933bf6d7f7e36b0f8ac410fbc37990f127c18
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Thu, 13 Sep 2012 18:14:30 +0000 (11:14 -0700)]
am
2b380488: P2P: Skip join in case of provision discovery failure
* commit '
2b380488c6b5d21e54e98397c7a8d6a9f16dd8b5':
P2P: Skip join in case of provision discovery failure
Dmitry Shmidt [Thu, 13 Sep 2012 18:14:29 +0000 (11:14 -0700)]
am
07f427a8: wpa_supplicant: Fix P2P command processing
* commit '
07f427a83c1bd048f8c4b6515d45f81e96877e37':
wpa_supplicant: Fix P2P command processing
Dmitry Shmidt [Thu, 13 Sep 2012 18:14:22 +0000 (11:14 -0700)]
am
2b380488: P2P: Skip join in case of provision discovery failure
* commit '
2b380488c6b5d21e54e98397c7a8d6a9f16dd8b5':
P2P: Skip join in case of provision discovery failure
Dmitry Shmidt [Thu, 13 Sep 2012 18:14:21 +0000 (11:14 -0700)]
am
07f427a8: wpa_supplicant: Fix P2P command processing
* commit '
07f427a83c1bd048f8c4b6515d45f81e96877e37':
wpa_supplicant: Fix P2P command processing
Dmitry Shmidt [Thu, 13 Sep 2012 17:52:13 +0000 (10:52 -0700)]
P2P: Skip join in case of provision discovery failure
Change-Id: I46cb3d2f17a45bf0ff62697040602334b818d805
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Thu, 13 Sep 2012 17:39:48 +0000 (10:39 -0700)]
wpa_supplicant: Fix P2P command processing
Change-Id: Ib2e811513be7b05178e310040f7cae14cb425421
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
The Android Open Source Project [Wed, 12 Sep 2012 14:40:25 +0000 (07:40 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ib4e56e8c6a3ec814cff5eff35b9bdc80d3dcbc1d
The Android Automerger [Wed, 12 Sep 2012 13:59:33 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Dmitry Shmidt [Tue, 11 Sep 2012 21:47:52 +0000 (14:47 -0700)]
am
f4f5db31: wpa_supplicant: Improve scan during p2p_find
* commit '
f4f5db315918f3f048324ea43dc37a3b0fb31ecc':
wpa_supplicant: Improve scan during p2p_find
Dmitry Shmidt [Tue, 11 Sep 2012 21:36:56 +0000 (14:36 -0700)]
wpa_supplicant: Improve scan during p2p_find
Change-Id: I733b23c2b7a24cfa96fe6593adbcbeb7d0798002
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Irfan Sheriff [Tue, 11 Sep 2012 17:19:13 +0000 (10:19 -0700)]
am
5a85f720: Merge "clear wfd_dev_info_hex before use" into jb-mr1-dev
* commit '
5a85f720c8e43866880fdf9446dc5ad9f45e9091':
clear wfd_dev_info_hex before use
Irfan Sheriff [Tue, 11 Sep 2012 17:17:37 +0000 (10:17 -0700)]
Merge "clear wfd_dev_info_hex before use" into jb-mr1-dev