aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* wext: Re-add support for SIGNAL_POLL and DRIVERRicardo Cerqueira2013-01-031-0/+7
| | | | | | | | Both of these are still used by JB, and wext wifi drivers have some weird behaviors without it (like a reported poor connection 100% of the time) Change-Id: I15339dbea4e15831465e2bb52b11675cb20dc34c
* Use legacy NL80211 STA events for older driversAndrew Dodd2012-12-157-6/+154
| | | | | | | | | | | | | | | | This allows tethering on devices with older bcmdhd drivers to be fixed. It conditionally reverts b638fe75d3cb9d21c67386173f10afe65053cc4d "nl80211: Use native cfg80211 sta events" for these boards. Use BOARD_LEGACY_NL80211_STA_EVENTS to enable this conditional revert. Forward-port to JB MR1, squashed in Steve Kondik's commit to handle additional changes. Change-Id: I4e436c57819944515455725cfd7ac7eeb31552ca
* merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-310-0/+0
|\
| * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-300-0/+0
| |\
| | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-230-0/+0
| | |\
| | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-170-0/+0
| | | |\
| | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-170-0/+0
| | | | |\
| | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-150-0/+0
| | | | | |\
| | | | | | * P2P: Fix network removal to select correct blockJouni Malinen2012-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-040-0/+0
| | | | | | |\
| | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-270-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-260-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-250-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-240-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-230-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-160-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-140-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-140-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-120-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-110-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * wpa_supplicant: Postpone P2P scan if usual scan is in progressDmitry Shmidt2012-09-101-23/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: b/7137954 Change-Id: I64ef8dbb51c354b4cdebe490ffcd2cec07995939 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | | | | | | | | | | | | | | | Merge "Increase timeouts for p2p" into jb-mr1-devIrfan Sheriff2012-10-312-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Increase timeouts for p2pIrfan Sheriff2012-10-302-0/+20
| |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | Add parameter checking and error reporting to wpa_blacklist API.Sasha Levitskiy2012-10-291-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7423119 Change-Id: Iae85361aa0dc94a75bffd07deef451c85e3d9d96 Signed-off-by: Sasha Levitskiy <sanek@google.com>
* | | | | | | | | | | | | | | | | wpa_supplicant: Try to reject proper BSSID even if not set by the driverDmitry Shmidt2012-10-291-1/+4
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7423119 Change-Id: Id0266274c9c60f8eea872ca3cfa5ad40d9180789 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | | | | | | | | | | | | | Add better handling of CTRL-EVENT-ASSOC-REJECTJeff Johnson2012-10-231-4/+10
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | Support conc_pref when use_p2p_group_interface=0Jeff Johnson2012-10-171-15/+18
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | Increase channel delay to 100msIrfan Sheriff2012-10-161-0/+6
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | P2P: Improve robustness against lost ctrl::ackJouni Malinen2012-10-142-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | | | | | P2P: Fix network removal to select correct blockJouni Malinen2012-10-051-1/+1
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | P2P: Fix p2p_cancel processing during group formationJouni Malinen2012-10-031-0/+4
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | | | Remove unnecessary channel list filteringIrfan Sheriff2012-09-254-92/+30
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | wpa_supplicant: P2P-related fixesDmitry Shmidt2012-09-256-16/+88
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
* | | | | | | | | wpa_supplicant: P2P-related fixesDmitry Shmidt2012-09-249-46/+111
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
* | | | | | | | Fix build: Add ANDROID_P2P for SCC interop fixesIrfan Sheriff2012-09-234-1/+33
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I847b63428b47016cf9a9a0b090636e1d5b9d28b8
* | | | | | | GC channel fixes for better interop with SCCIrfan Sheriff2012-09-234-19/+135
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | | | Do not inform other virtual interfaces of scan results in all casesJouni Malinen2012-09-142-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | P2P: Schedule new scan if P2P operation delays scanJouni Malinen2012-09-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | P2P: Check all interfaces for pending scan for p2p_scan failuresJouni Malinen2012-09-141-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | P2P: Move p2p_cb_on_scan_complete to global contextJouni Malinen2012-09-145-47/+17
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | wpa_supplicant: Skip unnecessary scan attemptsDmitry Shmidt2012-09-142-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieea8843c0fcb063dbb1df56e5cdf3fbdd0590cd4 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | | wpa_supplicant: Update to 10-Sep-2012 TOTDmitry Shmidt2012-09-1320-145/+881
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | P2P: Skip join in case of provision discovery failureDmitry Shmidt2012-09-131-1/+12
| | | | | | | | | | | | | | | | | | | | Change-Id: I46cb3d2f17a45bf0ff62697040602334b818d805 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | wpa_supplicant: Fix P2P command processingDmitry Shmidt2012-09-132-9/+11
|/ / / | | | | | | | | | | | | Change-Id: Ib2e811513be7b05178e310040f7cae14cb425421 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | wpa_supplicant: Improve scan during p2p_findDmitry Shmidt2012-09-113-10/+12
| | | | | | | | | | | | | | | Change-Id: I733b23c2b7a24cfa96fe6593adbcbeb7d0798002 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | Merge "clear wfd_dev_info_hex before use" into jb-mr1-devIrfan Sheriff2012-09-111-0/+1
|\ \ \ | |/ / |/| |
| * | clear wfd_dev_info_hex before useIrfan Sheriff2012-09-111-0/+1
| |/ | | | | | | Change-Id: Ic5cdb4df220834faf9e7da5cc1cc0a4191e6abd1
* | Merge "Revert "wpa_supplicant: Explicitly enable 802.11n and 802.11d for ↵Iliyan Malchev2012-09-101-8/+0
|\ \ | | | | | | | | | qcwcn"" into jb-mr1-dev
| * | Revert "wpa_supplicant: Explicitly enable 802.11n and 802.11d for qcwcn"Iliyan Malchev2012-09-101-8/+0
| | | | | | | | | | | | | | | | | | This reverts commit 5d03c02c2828db5e40f92774dc78903d69677b20 Change-Id: I27492d70600007f6a1230b166e03c7a47ad63788
* | | wpa_supplicant: Postpone P2P scan if usual scan is in progressDmitry Shmidt2012-09-101-23/+14
| | | | | | | | | | | | | | | | | | | | | BUG: b/7137954 Change-Id: I64ef8dbb51c354b4cdebe490ffcd2cec07995939 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>