aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | 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>
* | | wpa_supplicant: Update to 07-Sep-2012 TOTDmitry Shmidt2012-09-1040-1343/+1718
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 44256451130c4766e4a019162de17d0734444ee9 Author: Arik Nemtsov <arik@wizery.com> Date: Fri Sep 7 00:22:40 2012 +0300 AP: Configure basic rates from iface and not conf Skipped patches: 20ed5e40ba95440a1946cf2dffad3047fb620582 cf8baca6a5719f4f3257631e03317affee015417 a297201df15656dbb0f37e90f3410d9e8102c6fd 620c783753bddd37988269314862dc7e4a62f700 Change-Id: I857aa80af6d1a21b61f7c03a085e7dfc6066d61a Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | Add WFD dev info in device found eventIrfan Sheriff2012-09-091-2/+13
| | | | | | | | Change-Id: If25804d41e7ea1d028a30c180290d8de547f43e8
* | AP: Configure basic rates from iface and not confArik Nemtsov2012-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | The conf doesn't contain any basic rates in some cases. Most notably, when starting a P2P GO in 5 GHz. Use the iface rates which are initialized in hostapd_prepare_rates() to the conf rates or set to default values if no conf values exist. This fixes a bug introduced in commit e5693c4775bae65faa960f80889f98b0a6cb2e1c. Signed-hostap: Arik Nemtsov <arik@wizery.com>
* | P2P: Do not fail p2p_group_remove just based on current_ssidJouni Malinen2012-09-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The wpa_s->current_ssid pointer may get cleared, e.g., when disconnected. Commit 30ee769235f3170d9bf6b62c11c6e018e97deb84 made wpas_p2p_group_delete() exit early before removing a P2P interface in this type of case. That can cause number of issues from p2p_group_remove command failing to busy loop when terminating wpa_supplicant if there is a P2P group interface in client mode and that interface happens to be in disconnected state. Fix these issues by allowing wpas_p2p_group_delete() remove the P2P group interface regardless of whether wpa_s->currnt_ssid is set. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
* | P2P: Allow p2p_invite-persistent to specify channel for GOJouni Malinen2012-09-096-10/+34
| | | | | | | | | | | | | | The freq and ht40 parameters can now be used with the p2p_invite command when reinvoking a persistent group as the GO. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
* | Merge "SME: Fix disconnec-while-authenticating" into jb-mr1-devDmitry Shmidt2012-09-091-1/+5
|\ \
| * | SME: Fix disconnec-while-authenticatingJouni Malinen2012-09-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 0d30cc240fa36905b034dc9676f9d8da0ac18e56 forced wpa_s->current_ssid to be cleared in wpa_supplicant_mark_disassoc() which gets called from wpa_supplicant_event_disassoc(). This broke SME disassoc-while-authenticating workaround for cfg80211. Fix this by restoring wpa_s->current_ssid in case SME authentication is in progress. Signed-hostap: Jouni Malinen <j@w1.fi>
* | | Merge "Fix disconnection event processing" into jb-mr1-devDmitry Shmidt2012-09-093-24/+62
|\ \ \ | |/ /
| * | Fix disconnection event processingJouni Malinen2012-09-093-24/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 0d30cc240fa36905b034dc9676f9d8da0ac18e56 forced wpa_s->current_ssid and wpa_s->key_mgmt to be cleared in wpa_supplicant_mark_disassoc() which gets called from wpa_supplicant_event_disassoc(). This broke IEEE 802.1X authentication failure processing and P2P deauthentication notification (group termination). Fix this by splitting wpa_supplicant_event_disassoc() into two parts and make wpas_p2p_deauth_notif() indicate whether the interface was removed. If so, the last part of disassocition event processing is skipped. Since the wpa_supplicant_mark_disassoc() call is in the second part, the above mentioned issues are resolved. In addition, this cleans up the P2P group interface removal case by not trying to use fast reconnection mechanism just before the interface gets removed. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
* | | Merge "Fix REMOVE_NETWORK to not run operations with invalid current_ssid" ↵Dmitry Shmidt2012-09-091-2/+7
|\ \ \ | |/ / | | | | | | into jb-mr1-dev
| * | Fix REMOVE_NETWORK to not run operations with invalid current_ssidDeepthi Gowri2012-09-091-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the REMOVE_NETWORK command is used to delete the currently connected network, some operations were run between removing the network and clearing of wpa_s->current_ssid. This left wpa_s->current_ssid pointing to freed memory and should any operation end up using it before the pointer gets cleared, freed memory could be references. Avoid this by removing the network only after having completed the operations that clear wpa_s->current_ssid. Signed-hostap: Deepthi Gowri <deepthi@codeaurora.org> intended-for: hostap-1
* | | Merge "nl80211: Register read_sta_data() handler for station only builds" ↵Dmitry Shmidt2012-09-094-5/+15
|\ \ \ | |/ / | | | | | | into jb-mr1-dev
| * | nl80211: Register read_sta_data() handler for station only buildsJouni Malinen2012-09-094-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | This driver_op can now be used in station mode, too, to fetch information about the connection with the AP, so allow this to be used even if wpa_supplicant is built without AP mode support. Change-Id: Ibef1d27ed0e2df312e715a88d500500c661860d1 Signed-hostap: Jouni Malinen <j@w1.fi>
* | | am 26e08cb4: (-s ours) Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-09-070-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '26e08cb4a4ab9f9bc5446f4b831dec1828331cba': Fix 'restore STA reconnection behavior' cherry-pick Restore STA reconnection behavior
| * \ \ Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-09-070-0/+0
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: If17cb68d4590892767c5c9669b194c8c8cda68b6
| | * | | Fix 'restore STA reconnection behavior' cherry-pickDmitry Shmidt2012-09-063-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: b/6400311 Change-Id: I7b90ab9b5430b92e9e4e5702c3b1805a6bbc0b9a Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| | * | | Restore STA reconnection behaviorIrfan Sheriff2012-09-061-17/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Have the customized retry behavior only for P2P & do group failure indication beyond 5 retries Bug: b/6674338, b/6910598, b/6400311 Change-Id: I58cba356ebdb7fc4eaa9bedfa417b7d5d35bb306 Conflicts: wpa_supplicant/events.c
* | | | | Fix join for p2p_connectIrfan Sheriff2012-09-061-1/+1
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | wps_pbc with interface command stripped out ends up as a null character. Supplicant tries to interpret that as a bssid. Fix it to ignore null character as empty bssid Change-Id: Ic91d6657efaf03fbe5c4a03e9e630b4b3ff5dec4
* | | | hostapd: Allow hostapd_cli to work on AndroidJeff Johnson2012-09-062-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add definitions of the Android specific directories used for control interface sockets so that hostapd_cli can connect to the Android hostapd. Change-Id: Iabcd8d70ef61fae6656066991240d55e65a032e4
* | | | wpa_supplicant: Update to 29-Aug-2012 TOTDmitry Shmidt2012-09-04217-3036/+13365
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 6ffdc2f7bd496ace7a46e055f9714e7db4b1f722 Author: Jouni Malinen <jouni@qca.qualcomm.com> Date: Fri Mar 2 22:31:04 2012 +0200 WFD: Add preliminary WSD request processing and response This commit does not yet address support for different device roles, i.e., the same set of subelements are returned regardless of which role was indicated in the request. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> Change-Id: I9d63acce719b982c02e589bb59602382e82988c8 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | wpa_supplicant: Update to BRCM version 0.8.0-38Dmitry Shmidt2012-09-041-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Restore p2p_group_formation pointer till the 4-way handshake completes for the p2p client Change-Id: I976659ae5dac4cf01ecdd7995ff9abb6bf914bc1 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | Fix am cef482f8: mergeDmitry Shmidt2012-09-041-6/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I47a4610b40092d81a4d62e53a26924c4f9d05a17 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | am cef482f8: am 0531f204: Fix \'restore STA reconnection behavior\' cherry-pickDmitry Shmidt2012-09-041-0/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'cef482f830a787f249e7719ffb7d45db19ba1feb': Fix 'restore STA reconnection behavior' cherry-pick
| * | | am 0531f204: Fix \'restore STA reconnection behavior\' cherry-pickDmitry Shmidt2012-09-043-5/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '0531f20404b2e284d1b444d5af48b6e0c629975b': Fix 'restore STA reconnection behavior' cherry-pick
| | * | | Fix 'restore STA reconnection behavior' cherry-pickDmitry Shmidt2012-09-043-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: b/6400311 Change-Id: I7b90ab9b5430b92e9e4e5702c3b1805a6bbc0b9a Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | | am c5c02f1d: (-s ours) am a831bff7: Restore STA reconnection behaviorIrfan Sheriff2012-09-040-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'c5c02f1d8a39ff95f2a01e1cee7daf3c0ade6dbe': Restore STA reconnection behavior
| * | | | am a831bff7: Restore STA reconnection behaviorIrfan Sheriff2012-09-041-17/+33
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'a831bff72fa9e58cc9f71717f63c7649002e64fb': Restore STA reconnection behavior
| | * | | Restore STA reconnection behaviorIrfan Sheriff2012-09-041-17/+33
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Have the customized retry behavior only for P2P & do group failure indication beyond 5 retries Bug: b/6674338, b/6910598, b/6400311 Change-Id: I58cba356ebdb7fc4eaa9bedfa417b7d5d35bb306 Conflicts: wpa_supplicant/events.c
* | | | Debug-print command only in case of interface prefixDmitry Shmidt2012-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: If0054e8f7f4ffb2d559207d8939235938ae19f18 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | wpa_supplicant: Update to BRCM version 0.8.0-37Dmitry Shmidt2012-08-244-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Allow AP_SME support - Do not send disassoc after EAP failure since AP_SME is enabled and del_station will be called - Allow group idle timeout to run during WPS disconnect Change-Id: I7e9e15b9c44804196bc98c01d51a71e24412b91d Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | wpa_supplicant: Add bss_flush command to invalidate scan resultsDmitry Shmidt2012-08-242-0/+36
| |_|/ |/| | | | | | | | | | | Change-Id: I1a6ebc4fe53e16909ac44e2d04a6b651993dae91 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | wpa_supplicant: Explicitly enable 802.11n and 802.11d for qcwcnJeff Johnson2012-08-221-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | The Qualcomm qcwcn driver relies upon information from the supplicant to enable 802.11n and 802.11d support. Unfortunately there currently does not exist configuration file parameters to control these items, therefore hard code these in the supplicant. Change-Id: Iaa586c58d96bd8966b47f6e18b627648df89c03e
* | | Merge "wpa_supplicant: Fix wpa_drv_pktcnt_poll() call" into jb-mr1-devDmitry Shmidt2012-08-221-1/+1
|\ \ \
| * | | wpa_supplicant: Fix wpa_drv_pktcnt_poll() callDmitry Shmidt2012-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I265b095235890be623090272a81e67123ff86185 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | Add support for Qualcomm qcwcn Wireless Connectivity solutionJeff Johnson2012-08-192-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the wpa_supplicant and hostapd makefiles to enable ANDROID_P2P and ANDROID_QCOM_WCN conditional compilation when the BOARD_WLAN_DEVICE is qcwcn. Change-Id: I5d8216bdede6d6eb6613a83cda2c67c5eb7c2280
* | | | wpa_supplicant: Update to BRCM version 0.8.0-36Dmitry Shmidt2012-08-173-0/+32
|/ / / | | | | | | | | | | | | Change-Id: Ic3f1375953f4a7c77d2208f8436d951889093397 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | am 978afbdb: am 6f0634d6: Merge "Get rid of LOCAL_MODULE_TAGS := user"Joe Onorato2012-08-171-1/+0
|\ \ \ | |/ / | | | | | | | | | * commit '978afbdbf1e4b5e950f419ad5c24d08cd7df1f6d': Get rid of LOCAL_MODULE_TAGS := user
| * | am 6f0634d6: Merge "Get rid of LOCAL_MODULE_TAGS := user"Joe Onorato2012-08-161-1/+0
| |\ \ | | | | | | | | | | | | | | | | * commit '6f0634d6c8d1b07cc281db15c1a63ec348ebada0': Get rid of LOCAL_MODULE_TAGS := user