aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'jb_mr2' of ↵cm-10.2.1cm-10.2.0stable/cm-10.2cm-10.2Steve Kondik2013-11-0716-35/+316
|\ | | | | | | git://codeaurora.org/platform/external/wpa_supplicant_8 into cm-10.2
| * Merge "P2P: Make sure wait for the first client gets stopped"Linux Build Service Account2013-11-041-0/+6
| |\
| | * P2P: Make sure wait for the first client gets stoppedJouni Malinen2013-10-301-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a group was removed before the wait for the first client had timed out and the client had not yet connected, p2p_go_wait_client could have been left set and with that, scan operations could be unnecessarily delayed. This fixes some undesired delays from commit c1c0b35fea656345b672984910cc3b93938bc5e5. CRs-Fixed: 554201 Git-commit: adeb4f59a22e73f0f0560ba6340a39b2e1d089e8 Git-repo: git://w1.fi/srv/git/hostap.git Signed-hostap: Jouni Malinen <j@w1.fi>
| * | Merge "WPS: Allow Device Password Id changes between PIN methods"Linux Build Service Account2013-11-041-0/+18
| |\|
| | * WPS: Allow Device Password Id changes between PIN methodsJouni Malinen2013-10-301-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit b4a17a6ea74b2ffba082e05c84730e979513042c added support for the WPS Registrar to change the Device Password based on WSC specification design. However, this added validation for Registrar behavior which resulted in preventing a common P2P use case from working. Relax the validation rules for builds with P2P enabled to allow the Enrollee (P2P client) accepting M1/M2 changes in Device Password Id between Default and Registrar-specified PIN. CRs-Fixed: 538654 Git-commit: 9b1693a162d0c31752098d54181d2ef7631c6135 Git-repo: git://w1.fi/srv/git/hostap.git Signed-hostap: Jouni Malinen <j@w1.fi>
| * | Merge "Fix ENABLE_NETWORK not to reconnect in disconnected state"Linux Build Service Account2013-11-041-2/+2
| |\ \
| | * | Fix ENABLE_NETWORK not to reconnect in disconnected stateJouni Malinen2013-10-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DISCONNECT followed by ENABLE_NETWORK ended up starting a scan for a new connection due to wpa_supplicant_enable_one_network() setting wpa_s->reassociate = 1. This was done regardless of wpa_s->disconnected being 1 which should imply that wpa_supplicant should not try to connect before asked explicitly with REASSOCIATE or RECONNECT. Fix this by making ENABLE_NETWORK setting of reassociate = 1 and starting of scans for connection conditional on wpa_s->disconnected == 0. This will make ENABLE_NETWORK trigger a connection only if wpa_supplicant is already in a state where it would try to connect if there are any enabled networks. Change-Id: I3f15688d7016551219182e6f8e751941b6340aa6 CRs-Fixed: 564226 Git-commit:d2592497624d7dff53e71cc01fc2d5db1e59733e Git-repo: git://w1.fi/srv/git/hostap.git Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
| * | | Merge "Set GTK rekey offload information after initial group key handshake"Linux Build Service Account2013-11-021-3/+5
| |\ \ \
| | * | | Set GTK rekey offload information after initial group key handshakeSunil Dutt2013-10-311-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GTK rekey offload information was sent to the driver immediately after the 4-way handshake which ended up being before the initial group key exchange in the case of WPA (v1). This could result in even that initial GTK handshake being offloaded and wpa_supplicant being left in WPA_GROUP_HANDSHAKE state. Fix this by postponing the operation to happen only after the full set of initial EAPOL-Key exchanges have been completed (i.e., in the existing location for WPA2 and a after the group key handshake for WPA). Change-Id: Ieb92c44845b092072145d2943e3cde500b0a2451 CRs-Fixed: 530560 Git-commit: 392e68e81f186b0f05beb14ac2128b9d6e76fe92 Git-repo: git://w1.fi/srv/git/hostap.git Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
| * | | | Merge "Update regulatory change to all virtual interface for the phy"Linux Build Service Account2013-11-021-10/+46
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Update regulatory change to all virtual interface for the phyVinay Krishna Eranna2013-10-311-10/+46
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wpas_p2p_setup_channels function uses the per interface information (wpa_s->hw.modes) for setting up the available channel list for P2P operation, but if a separate P2P interface is used (e.g., p2p0 on Android), the wpa_s instance for that interface may not get an updated channel list. This can result in some operations, like "P2P_SET disallow_freq", using old channel list information (e.g., world roaming information with passive-scan/no-ibss flags) which was initialized during the start-up. This could result in P2P functionality using conflicting or obsolete channel information. To resolve this issue, update channel list information on regulatory change events to all of the virtual interfaces sharing the same phy for which the event is received. CRs-Fixed: 556398 Git-commit: 731ca6364e7e43997c2b7d715da0a7a0c5cb2ad9 Git-repo: git://w1.fi/srv/git/hostap.git Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> Change-Id: I6c2f163bdf9e81d6d8d8295a1ec9bc0c57308edd
| * | | Merge "Merge "hostapd: Make install path configurable""Linux Build Service Account2013-10-250-0/+0
| |\| |
| * | | Merge "hostapd: Make install path configurable"Linux Build Service Account2013-10-250-0/+0
| |\ \ \
| * \ \ \ Merge "P2P: Clear p2p_group_formation and p2p_in_provisioning on group removal"Linux Build Service Account2013-10-250-0/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge "P2P Extend postponing of concurrent scans for persistent GO"Linux Build Service Account2013-10-250-0/+0
| |\ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge "hostapd: Make install path configurable"Linux Build Service Account2013-10-241-3/+6
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | hostapd: Make install path configurablePrashanth Bhatta2013-10-141-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makefile always installs to /usr/local/sbin and on some platforms, /usr/local/sbin is not in default search path. Modified the makefile such that bin path can be configurable so that build system can pass appropriate path for installation. If bin path is not specified then by default binaries are installed in /usr/local/sbin. Change-Id: I9b5c460e62778159491209edc357f8f9888fd653
| * | | | Merge "P2P: Clear p2p_group_formation and p2p_in_provisioning on group removal"Linux Build Service Account2013-10-241-0/+5
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | P2P: Clear p2p_group_formation and p2p_in_provisioning on group removalDeepthi Gowri2013-10-221-0/+5
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 41f853235fe1d1fad1acecc0ee5dfe81c872c6b2 extends group formation timeout for the first data connection to complete and resets p2p_go_group_formation_completed flag due to which p2p_in_provisioning and p2p_group_formation flags are not cleared when wpas_group_formation_completed() is called. This can result in both station scan and p2p_find failures in the case where separate P2P group interface is not used and the client does not complete 4-way handshake. Fix this by clearing p2p_group_formation and p2p_in_provisioning when such a P2P group is deleted. Change-Id: Ia1842eca41e01d6ecc07d09f4a3d9deb413acbd5 CRs-Fixed: 554197 Git-commit: acdd0fc84f01d8b5e8aa39d6e4573cee0b5ac707 Git-repo: git://w1.fi/srv/git/hostap.git Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
| * | | Merge "P2P Extend postponing of concurrent scans for persistent GO"Linux Build Service Account2013-10-241-0/+1
| |\| |
| | * | P2P Extend postponing of concurrent scans for persistent GODeepthi Gowri2013-10-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the p2p_go_wait_client timestamp in p2p_go_configured() to address the case where the group is set up without the provisioning step. Change-Id: Idff6b55f2d572fc27ee8abcf05778a7ed5451632 CRs-Fixed: 554201 Git-commit: 6903ee6f62e4585451c1e4f90db8ca8d7cc82070 Git-repo: git://w1.fi/srv/git/hostap.git Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
| * | | Merge "P2P: Allow persistent group determination based on Beacon frame"Linux Build Service Account2013-10-241-0/+3
| |\ \ \
| | * | | P2P: Allow persistent group determination based on Beacon frameJouni Malinen2013-10-181-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | P2P IE may be available from a Beacon frame from a GO even if we have not yet received a Probe Response frame with P2P IE from that GO. Since all the needed information for determining the GO's P2P Device Address and group capabilities are available, use that information instead of displaying incomplete group information. Change-Id: I4eb179351b1d104d2ca31023c3405aaa570d21fc CRs-Fixed: 535523 Git-commit: 5df7414b04fc0bfa0abea1a2662746d348104972 Git-repo: git://w1.fi/srv/git/hostap.git Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
| * | | | Merge "P2P: Do not allow P2P client connection without P2P IE from GO"Linux Build Service Account2013-10-241-0/+7
| |\| | |
| | * | | P2P: Do not allow P2P client connection without P2P IE from GOJouni Malinen2013-10-181-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | P2P-GROUP-STARTED event depends on having enough information about the group available. To avoid incomplete information from being delivered to upper layers, do not accept scan results without P2P IE (e.g., from a non-P2P scan) for P2P client association process. This can be of use for some join-a-group cases where non-P2P scans have generated the BSS entry for the GO. Change-Id: I42bc5c5cc17d7786eaf4018c2774bb13bb6e4be2 CRs-Fixed: 535523 Git-commit: b72e14e599785e377881a2a8cd26b42f90bdc5f6 Git-repo: git://w1.fi/srv/git/hostap.git Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
| * | | | Merge "P2P: Do not drop P2P IEs from BSS table on non-P2P scans"Linux Build Service Account2013-10-241-0/+16
| |\| | |
| | * | | P2P: Do not drop P2P IEs from BSS table on non-P2P scansJouni Malinen2013-10-181-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This could happen when non-P2P station interface runs a scan without P2P IE in the Probe Request frame. P2P GO would reply to that with a Probe Response that does not include P2P IE. Do not update the IEs in this BSS entry to avoid such loss of information that may be needed for P2P operations to determine group information. Change-Id: I2af1f4487a358da57b885ff63e879aaea4fd2508 CRs-Fixed: 535523 Git-commit: ff57398fcab817374dac975aaab3eef5bf64f381 Git-repo: git://w1.fi/srv/git/hostap.git Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
| * | | | Merge "P2P: Allow GO to be discovered based on Beacon frame"Linux Build Service Account2013-10-243-2/+56
| |\| | |
| | * | | P2P: Allow GO to be discovered based on Beacon frameJouni Malinen2013-10-183-2/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes some P2P-join-a-group cases where GO may have been discovered based on passive scan or non-P2P scan. P2P IEs may have been received from a Beacon frame in such a case and that information can be used to create a P2P peer entry, e.g., to allow provision discovery exchange to be completed. Change-Id: I8502c61fa0f149f7636708458f5e51ca627ac6b7 CRs-Fixed: 535523 Git-commit: aaeb9c98e6aad64bbf92c7cb6ef4531c039b8a1d Git-repo: git://w1.fi/srv/git/hostap.git Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
| * | | | Merge "P2P: Show p2p flag in debug info for scan results"Linux Build Service Account2013-10-241-2/+5
| |\ \ \ \
| | * | | | P2P: Show p2p flag in debug info for scan resultsJouni Malinen2013-10-181-2/+5
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it easier to confirm that P2P capabilities for a GO has been discovered properly. Change-Id: If214f9c8ea492fb2f13a0dbb98fd964f7d118531 CRs-Fixed: 535523 Git-commit: b16696ff72969329c9e4507f9bbcaf5882b492f7 Git-repo: git://w1.fi/srv/git/hostap.git Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
| * | / / Merge "P2P: Show P2P flag in BSS entries also based on Beacon frames"Linux Build Service Account2013-10-243-1/+43
| |\| | | | | |/ / | |/| |
| | * | P2P: Show P2P flag in BSS entries also based on Beacon framesJouni Malinen2013-10-183-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is possible that a P2P GO has been discovered through a non-P2P scan that did not return P2P IE in Probe Response frames. To cover those cases, check also Beacon frame (if received) for P2P IE. Change-Id: If1d855022785f5d801e2d91c1d2fcac35760f717 CRs-Fixed: 535523 Git-commit: bb50ae439686fb69f52288a618e6d176462ab726 Git-repo: git://w1.fi/srv/git/hostap.git Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
| * | | Merge "Add disable_scan_offload parameter to wpa_supplicant.conf"Linux Build Service Account2013-10-170-0/+0
| |\ \ \ | | |/ / | |/| |
| * | | Merge "Add disable_scan_offload parameter to wpa_supplicant.conf"Linux Build Service Account2013-10-161-0/+1
| |\| |
| | * | Add disable_scan_offload parameter to wpa_supplicant.confHardik Kantilal Patel2013-10-151-0/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | By default, wpa_supplicant tries to offload scanning if the driver indicates support for this (sched_scan). This configuration parameter can be used to disable this automatic offloading mechanism. Change-Id: I0dff8d8acbfb04f7b47e342b37c93d381eefb7cc CRs-fixed: 545719
| * | Merge "P2P: Increase Invitation Request timeouts"Linux Build Service Account2013-10-151-2/+2
| |\ \
| | * | P2P: Increase Invitation Request timeoutsSwaroop Golti2013-10-101-2/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In noisy environment peer may take more time to send Invitation Response so increase Invitation Response timeout to 500 ms in success case and also increase Invitation Request action wait time to 500 ms. This makes the Invitation Request case use the same timeout with GO Negotiation. CRs-Fixed: 538699 Git-commit: 63ce59dea8c6b458d9a0c24e91f971f461f17b79 Git-repo: git://w1.fi/srv/git/hostap.git Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> Change-Id: Idd3dea0e7ed16cd7564b34dfe279a49f16f021d4
| * | Merge "TDLS: Tear down TDLS using wpas_drv_tlds_oper() if not external"Linux Build Service Account2013-10-151-2/+9
| |\ \
| | * | TDLS: Tear down TDLS using wpas_drv_tlds_oper() if not externalArend van Spriel2013-10-081-2/+9
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the device indicates to take care of TDLS operations the TDLS setup is done calling wpas_drv_tdls_oper(). This patch does a similar thing for the teardown. This fixes failure of teardown: "TDLS: Could not find peer <mac> for link Teardown" Signed-hostap: Arend van Spriel <arend@broadcom.com> Git-commit: 4ed8d954dd4f714ac648b25fc3ec260592fda41b Git-repo : git://w1.fi/srv/git/hostap.git CRs-fixed: 555255 Change-Id: I9134b3edece3c6e9d7fb5328910d4c9c41df4fb7
| * | Merge "P2P: Use group formation timeout on persistent group GO"Linux Build Service Account2013-10-155-6/+41
| |\ \
| | * | P2P: Use group formation timeout on persistent group GOJouni Malinen2013-10-075-6/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, GO considered the group to be fully re-invoked after starting beaconing on successful invitation exchange. This would leave the group running until idle timeout (which may not be enabled) or explicit removal if the client fails to connect for any reason. Since the client is expected to connect immediately after the invitation exchange that ends with status=0 (i.e., either client initiated the exchange or it responded with success), extend group formation timeout to cover that period until the first successfully completed data connection. This allows the GO to remove the group automatically if the client devices does not connect within P2P_MAX_INITIAL_CONN_WAIT_GO_REINVOKE (15) seconds. Change-Id: I5a9622e46ff032a8297a55ba6e6d724a42834762 CRs-Fixed: 538026 Git-commit: bbc6c729a58897e9265d53d53677b3ddeda4ff94 Git-repo: git://w1.fi/srv/git/hostap.git Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
| * | | Merge "P2P: Extend group formation timeout on GO to first data connection"Linux Build Service Account2013-10-152-4/+36
| |\| |
| | * | P2P: Extend group formation timeout on GO to first data connectionJouni Malinen2013-10-072-4/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, GO considered the group to be fully formed at the completed of WPS provisioning step. This would leave the group running until idle timeout (which may not be enabled) or explicit removal if the client fails to connect for any reason. Since the client is expected to connect immediately after the WPS provisioning step, extend group formation timeout to cover that period until the first successfully completed data connection. This allows the GO to remove the group automatically if the client devices does not connect within P2P_MAX_INITIAL_CONN_WAIT_GO (10) seconds. Change-Id: Ia33cbf738490d89263c80a39d9044500a847b470 CRs-Fixed: 538026 Git-commit: 41f853235fe1d1fad1acecc0ee5dfe81c872c6b2 Git-repo: git://w1.fi/srv/git/hostap.git Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
| * | | Merge "P2P: Cancel group formation timeout on client connection"Linux Build Service Account2013-10-151-0/+10
| |\| | | | |/ | |/|
| | * P2P: Cancel group formation timeout on client connectionJouni Malinen2013-10-041-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was possiblle for the group formation timeout to be left running even after the P2P Client connected to the group if the WPS provisioning step was not completed cleanly (e.g., due to WSC_Done not getting received from the client). There is no need to remove the group in such case due to the initial group formation timeout, so work around this by removing that timeout on data connection. CRs-Fixed: 538026 Git-commit: eab2b50dc83e1d14dcb573dfc9b10fc6a9cb1cdd Git-repo: git://w1.fi/srv/git/hostap.git Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> Change-Id: I15e65a8e2436db5c408d5960bff6ba7af16f62c1
* | | Disable 802.11w hooks in the wext drivercm-10.2-M1Ricardo Cerqueira2013-10-211-2/+2
| | | | | | | | | | | | | | | | | | | | | 802.11w support doesn't work with the generic driver, even if the missing definitions are added. Disable it. Change-Id: I96d9358f37e6e2832a4b4d37e09a522869b073d0
* | | Merge branch 'jb_mr2' of ↵Steve Kondik2013-10-0743-428/+1569
|\| | | | | | | | | | | | | | | | | git://codeaurora.org/platform/external/wpa_supplicant_8 into cm-10.2 Change-Id: I2b37453bc5b7022cabea29c2da432694952fbd55
| * | Merge "TDLS: Do not start concurrent TDLS setup"Linux Build Service Account2013-10-041-0/+11
| |\ \
| | * | TDLS: Do not start concurrent TDLS setupSunil Dutt2013-10-031-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new TDLS request shall transmit TPK M1 frame with a unique INonce. Thus a new explicit request would fail an ongoing TDLS negotiation with the error "TDLS: FTIE SNonce in TPK M3 does not match with FTIE SNonce used in TPK M1" if the peer happens to receive two M1 frames before an M3 frame. Check for the ongoing negotiation with the peer and do not start a new one if we are already in a setup negotiation with the peer. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> Git-commit: 5bfd7e91685e65977c8db72afdca0cab310f8667 Git-repo : git://w1.fi/srv/git/hostap.git Change-Id: I599f8cc9e7aff684f55590cfac547e0e1540a09d CRs-fixed: 552276
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-08 21:14:31 +0000