OSDN Git Service

android-x86/external-wpa_supplicant_8.git
11 years agoam 9bce59c7: wpa_supplicant: Update to 10-Sep-2012 TOT
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

11 years agowpa_supplicant: Update to 10-Sep-2012 TOT
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>
11 years agoam 2b380488: P2P: Skip join in case of provision discovery failure
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

11 years agoam 07f427a8: wpa_supplicant: Fix P2P command processing
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

11 years agoP2P: Skip join in case of provision discovery failure
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>
11 years agowpa_supplicant: Fix P2P command processing
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>
11 years agoam f4f5db31: wpa_supplicant: Improve scan during p2p_find
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

11 years agowpa_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>
11 years agoam 5a85f720: Merge "clear wfd_dev_info_hex before use" into jb-mr1-dev
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

11 years agoMerge "clear wfd_dev_info_hex before use" into jb-mr1-dev
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

11 years agoclear wfd_dev_info_hex before use
Irfan Sheriff [Tue, 11 Sep 2012 15:58:24 +0000 (08:58 -0700)]
clear wfd_dev_info_hex before use

Change-Id: Ic5cdb4df220834faf9e7da5cc1cc0a4191e6abd1

11 years agoam 9bc61e18: Merge "Revert "wpa_supplicant: Explicitly enable 802.11n and 802.11d...
Iliyan Malchev [Tue, 11 Sep 2012 00:15:18 +0000 (17:15 -0700)]
am 9bc61e18: Merge "Revert "wpa_supplicant: Explicitly enable 802.11n and 802.11d for qcwcn"" into jb-mr1-dev

* commit '9bc61e18ee9adc8511c55c6b6a3eca3dfd193e62':
  Revert "wpa_supplicant: Explicitly enable 802.11n and 802.11d for qcwcn"

11 years agoMerge "Revert "wpa_supplicant: Explicitly enable 802.11n and 802.11d for qcwcn""...
Iliyan Malchev [Tue, 11 Sep 2012 00:13:06 +0000 (17:13 -0700)]
Merge "Revert "wpa_supplicant: Explicitly enable 802.11n and 802.11d for qcwcn"" into jb-mr1-dev

11 years agoRevert "wpa_supplicant: Explicitly enable 802.11n and 802.11d for qcwcn"
Iliyan Malchev [Tue, 11 Sep 2012 00:12:53 +0000 (17:12 -0700)]
Revert "wpa_supplicant: Explicitly enable 802.11n and 802.11d for qcwcn"

This reverts commit 5d03c02c2828db5e40f92774dc78903d69677b20

Change-Id: I27492d70600007f6a1230b166e03c7a47ad63788

11 years agoam a2854abb: wpa_supplicant: Postpone P2P scan if usual scan is in progress
Dmitry Shmidt [Mon, 10 Sep 2012 23:31:27 +0000 (16:31 -0700)]
am a2854abb: wpa_supplicant: Postpone P2P scan if usual scan is in progress

* commit 'a2854abb63b41c123e4c78e5653a55d902f00be6':
  wpa_supplicant: Postpone P2P scan if usual scan is in progress

11 years agowpa_supplicant: Postpone P2P scan if usual scan is in progress
Dmitry Shmidt [Mon, 10 Sep 2012 23:15:47 +0000 (16:15 -0700)]
wpa_supplicant: Postpone P2P scan if usual scan is in progress

BUG: b/7137954

Change-Id: I64ef8dbb51c354b4cdebe490ffcd2cec07995939
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
11 years agoam 4530cfd4: wpa_supplicant: Update to 07-Sep-2012 TOT
Dmitry Shmidt [Mon, 10 Sep 2012 16:28:07 +0000 (09:28 -0700)]
am 4530cfd4: wpa_supplicant: Update to 07-Sep-2012 TOT

* commit '4530cfd4d14a77c58e35393b91e40f8dd9d62697':
  wpa_supplicant: Update to 07-Sep-2012 TOT

11 years agowpa_supplicant: Update to 07-Sep-2012 TOT
Dmitry Shmidt [Sun, 9 Sep 2012 22:20:40 +0000 (15:20 -0700)]
wpa_supplicant: Update to 07-Sep-2012 TOT

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>
11 years agoam 8367dc90: Add WFD dev info in device found event
Irfan Sheriff [Mon, 10 Sep 2012 00:14:23 +0000 (17:14 -0700)]
am 8367dc90: Add WFD dev info in device found event

* commit '8367dc909f536f600c7474582fe0a96bef7c78fc':
  Add WFD dev info in device found event

11 years agoAdd WFD dev info in device found event
Irfan Sheriff [Mon, 10 Sep 2012 00:08:19 +0000 (17:08 -0700)]
Add WFD dev info in device found event

Change-Id: If25804d41e7ea1d028a30c180290d8de547f43e8

11 years agoam 2d266067: AP: Configure basic rates from iface and not conf
Arik Nemtsov [Sun, 9 Sep 2012 21:23:48 +0000 (14:23 -0700)]
am 2d266067: AP: Configure basic rates from iface and not conf

* commit '2d266067893660e2a4b5f166a909ee8638a5c96a':
  AP: Configure basic rates from iface and not conf

11 years agoam 5c44edb0: P2P: Do not fail p2p_group_remove just based on current_ssid
Jouni Malinen [Sun, 9 Sep 2012 21:23:47 +0000 (14:23 -0700)]
am 5c44edb0: P2P: Do not fail p2p_group_remove just based on current_ssid

* commit '5c44edb00c9384534a1b50981071874436aaecd5':
  P2P: Do not fail p2p_group_remove just based on current_ssid

11 years agoam 31be0a4b: P2P: Allow p2p_invite-persistent to specify channel for GO
Jouni Malinen [Sun, 9 Sep 2012 21:22:20 +0000 (14:22 -0700)]
am 31be0a4b: P2P: Allow p2p_invite-persistent to specify channel for GO

* commit '31be0a4b946ecab910c0a9af3837dbccea5d204b':
  P2P: Allow p2p_invite-persistent to specify channel for GO

11 years agoAP: Configure basic rates from iface and not conf
Arik Nemtsov [Thu, 6 Sep 2012 21:22:40 +0000 (00:22 +0300)]
AP: Configure basic rates from iface and not conf

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>

11 years agoP2P: Do not fail p2p_group_remove just based on current_ssid
Jouni Malinen [Fri, 31 Aug 2012 18:35:32 +0000 (21:35 +0300)]
P2P: Do not fail p2p_group_remove just based on current_ssid

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>

11 years agoP2P: Allow p2p_invite-persistent to specify channel for GO
Jouni Malinen [Fri, 31 Aug 2012 18:20:51 +0000 (21:20 +0300)]
P2P: Allow p2p_invite-persistent to specify channel for GO

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>

11 years agoam dee117d0: Merge "SME: Fix disconnec-while-authenticating" into jb-mr1-dev
Dmitry Shmidt [Sun, 9 Sep 2012 21:03:12 +0000 (14:03 -0700)]
am dee117d0: Merge "SME: Fix disconnec-while-authenticating" into jb-mr1-dev

* commit 'dee117d008719acfac082af3740349fc86629627':
  SME: Fix disconnec-while-authenticating

11 years agoam 37f5fa5a: Merge "Fix disconnection event processing" into jb-mr1-dev
Dmitry Shmidt [Sun, 9 Sep 2012 21:03:11 +0000 (14:03 -0700)]
am 37f5fa5a: Merge "Fix disconnection event processing" into jb-mr1-dev

* commit '37f5fa5a8706c16490dd841c280bc015f79d81da':
  Fix disconnection event processing

11 years agoMerge "SME: Fix disconnec-while-authenticating" into jb-mr1-dev
Dmitry Shmidt [Sun, 9 Sep 2012 21:01:23 +0000 (14:01 -0700)]
Merge "SME: Fix disconnec-while-authenticating" into jb-mr1-dev

11 years agoMerge "Fix disconnection event processing" into jb-mr1-dev
Dmitry Shmidt [Sun, 9 Sep 2012 21:01:00 +0000 (14:01 -0700)]
Merge "Fix disconnection event processing" into jb-mr1-dev

11 years agoam 164eea3a: Merge "Fix REMOVE_NETWORK to not run operations with invalid current_ssi...
Dmitry Shmidt [Sun, 9 Sep 2012 20:58:40 +0000 (13:58 -0700)]
am 164eea3a: Merge "Fix REMOVE_NETWORK to not run operations with invalid current_ssid" into jb-mr1-dev

* commit '164eea3ac2d53d1fecf20d76fd6b9f1920c17df4':
  Fix REMOVE_NETWORK to not run operations with invalid current_ssid

11 years agoam 8084af89: Merge "nl80211: Register read_sta_data() handler for station only builds...
Dmitry Shmidt [Sun, 9 Sep 2012 20:58:39 +0000 (13:58 -0700)]
am 8084af89: Merge "nl80211: Register read_sta_data() handler for station only builds" into jb-mr1-dev

* commit '8084af89d283ed015e28a5eb781726ae5e138cf0':
  nl80211: Register read_sta_data() handler for station only builds

11 years agoMerge "Fix REMOVE_NETWORK to not run operations with invalid current_ssid" into jb...
Dmitry Shmidt [Sun, 9 Sep 2012 20:57:57 +0000 (13:57 -0700)]
Merge "Fix REMOVE_NETWORK to not run operations with invalid current_ssid" into jb-mr1-dev

11 years agoMerge "nl80211: Register read_sta_data() handler for station only builds" into jb...
Dmitry Shmidt [Sun, 9 Sep 2012 20:57:09 +0000 (13:57 -0700)]
Merge "nl80211: Register read_sta_data() handler for station only builds" into jb-mr1-dev

11 years agoSME: Fix disconnec-while-authenticating
Jouni Malinen [Sat, 1 Sep 2012 14:20:27 +0000 (17:20 +0300)]
SME: Fix disconnec-while-authenticating

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>

11 years agoFix disconnection event processing
Jouni Malinen [Fri, 31 Aug 2012 19:04:41 +0000 (22:04 +0300)]
Fix disconnection event processing

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>

11 years agoFix REMOVE_NETWORK to not run operations with invalid current_ssid
Deepthi Gowri [Mon, 3 Sep 2012 08:55:38 +0000 (11:55 +0300)]
Fix REMOVE_NETWORK to not run operations with invalid current_ssid

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

11 years agonl80211: Register read_sta_data() handler for station only builds
Jouni Malinen [Wed, 5 Sep 2012 14:07:03 +0000 (17:07 +0300)]
nl80211: Register read_sta_data() handler for station only builds

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>

11 years agoam 66bf9c42: (-s ours) am 26e08cb4: (-s ours) Reconcile with jb-mr0-release - do...
The Android Open Source Project [Fri, 7 Sep 2012 23:43:46 +0000 (16:43 -0700)]
am 66bf9c42: (-s ours) am 26e08cb4: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '66bf9c42970e42704a1618642662b9bc4997abfa':
  Fix 'restore STA reconnection behavior' cherry-pick
  Restore STA reconnection behavior

11 years agoam 26e08cb4: (-s ours) Reconcile with jb-mr0-release - do not merge
The Android Open Source Project [Fri, 7 Sep 2012 22:24:01 +0000 (15:24 -0700)]
am 26e08cb4: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '26e08cb4a4ab9f9bc5446f4b831dec1828331cba':
  Fix 'restore STA reconnection behavior' cherry-pick
  Restore STA reconnection behavior

11 years agoReconcile with jb-mr0-release - do not merge
The Android Open Source Project [Fri, 7 Sep 2012 22:21:12 +0000 (15:21 -0700)]
Reconcile with jb-mr0-release - do not merge

Change-Id: If17cb68d4590892767c5c9669b194c8c8cda68b6

11 years agoFix join for p2p_connect
Irfan Sheriff [Fri, 7 Sep 2012 01:30:39 +0000 (18:30 -0700)]
Fix join for p2p_connect

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

11 years agoFix 'restore STA reconnection behavior' cherry-pick
Dmitry Shmidt [Tue, 4 Sep 2012 23:52:41 +0000 (16:52 -0700)]
Fix 'restore STA reconnection behavior' cherry-pick

BUG: b/6400311

Change-Id: I7b90ab9b5430b92e9e4e5702c3b1805a6bbc0b9a
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
11 years agoRestore STA reconnection behavior
Irfan Sheriff [Mon, 18 Jun 2012 16:39:07 +0000 (09:39 -0700)]
Restore STA reconnection behavior

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

11 years agohostapd: Allow hostapd_cli to work on Android
Jeff Johnson [Tue, 4 Sep 2012 05:12:17 +0000 (22:12 -0700)]
hostapd: Allow hostapd_cli to work on Android

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

11 years agowpa_supplicant: Update to 29-Aug-2012 TOT
Dmitry Shmidt [Wed, 29 Aug 2012 23:22:06 +0000 (16:22 -0700)]
wpa_supplicant: Update to 29-Aug-2012 TOT

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>
11 years agowpa_supplicant: Update to BRCM version 0.8.0-38
Dmitry Shmidt [Tue, 4 Sep 2012 18:06:50 +0000 (11:06 -0700)]
wpa_supplicant: Update to BRCM version 0.8.0-38

- 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>
11 years agoFix am cef482f8: merge
Dmitry Shmidt [Wed, 5 Sep 2012 00:21:12 +0000 (17:21 -0700)]
Fix am cef482f8: merge

Change-Id: I47a4610b40092d81a4d62e53a26924c4f9d05a17
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
11 years agoam cef482f8: am 0531f204: Fix \'restore STA reconnection behavior\' cherry-pick
Dmitry Shmidt [Wed, 5 Sep 2012 00:04:57 +0000 (17:04 -0700)]
am cef482f8: am 0531f204: Fix \'restore STA reconnection behavior\' cherry-pick

* commit 'cef482f830a787f249e7719ffb7d45db19ba1feb':
  Fix 'restore STA reconnection behavior' cherry-pick

11 years agoam 0531f204: Fix \'restore STA reconnection behavior\' cherry-pick
Dmitry Shmidt [Wed, 5 Sep 2012 00:02:52 +0000 (17:02 -0700)]
am 0531f204: Fix \'restore STA reconnection behavior\' cherry-pick

* commit '0531f20404b2e284d1b444d5af48b6e0c629975b':
  Fix 'restore STA reconnection behavior' cherry-pick

11 years agoFix 'restore STA reconnection behavior' cherry-pick
Dmitry Shmidt [Tue, 4 Sep 2012 23:52:41 +0000 (16:52 -0700)]
Fix 'restore STA reconnection behavior' cherry-pick

BUG: b/6400311

Change-Id: I7b90ab9b5430b92e9e4e5702c3b1805a6bbc0b9a
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
11 years agoam c5c02f1d: (-s ours) am a831bff7: Restore STA reconnection behavior
Irfan Sheriff [Tue, 4 Sep 2012 23:40:59 +0000 (16:40 -0700)]
am c5c02f1d: (-s ours) am a831bff7: Restore STA reconnection behavior

* commit 'c5c02f1d8a39ff95f2a01e1cee7daf3c0ade6dbe':
  Restore STA reconnection behavior

11 years agoam a831bff7: Restore STA reconnection behavior
Irfan Sheriff [Tue, 4 Sep 2012 23:32:08 +0000 (16:32 -0700)]
am a831bff7: Restore STA reconnection behavior

* commit 'a831bff72fa9e58cc9f71717f63c7649002e64fb':
  Restore STA reconnection behavior

11 years agoRestore STA reconnection behavior
Irfan Sheriff [Mon, 18 Jun 2012 16:39:07 +0000 (09:39 -0700)]
Restore STA reconnection behavior

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

11 years agoDebug-print command only in case of interface prefix
Dmitry Shmidt [Mon, 27 Aug 2012 22:01:35 +0000 (15:01 -0700)]
Debug-print command only in case of interface prefix

Change-Id: If0054e8f7f4ffb2d559207d8939235938ae19f18
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
11 years agowpa_supplicant: Update to BRCM version 0.8.0-37
Dmitry Shmidt [Sat, 25 Aug 2012 00:03:35 +0000 (17:03 -0700)]
wpa_supplicant: Update to BRCM version 0.8.0-37

- 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>
11 years agowpa_supplicant: Add bss_flush command to invalidate scan results
Dmitry Shmidt [Fri, 24 Aug 2012 18:14:44 +0000 (11:14 -0700)]
wpa_supplicant: Add bss_flush command to invalidate scan results

Change-Id: I1a6ebc4fe53e16909ac44e2d04a6b651993dae91
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
11 years agowpa_supplicant: Explicitly enable 802.11n and 802.11d for qcwcn
Jeff Johnson [Mon, 13 Aug 2012 23:56:18 +0000 (16:56 -0700)]
wpa_supplicant: Explicitly enable 802.11n and 802.11d for qcwcn

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

11 years agoMerge "wpa_supplicant: Fix wpa_drv_pktcnt_poll() call" into jb-mr1-dev
Dmitry Shmidt [Wed, 22 Aug 2012 17:12:57 +0000 (10:12 -0700)]
Merge "wpa_supplicant: Fix wpa_drv_pktcnt_poll() call" into jb-mr1-dev

11 years agowpa_supplicant: Fix wpa_drv_pktcnt_poll() call
Dmitry Shmidt [Wed, 22 Aug 2012 00:27:22 +0000 (17:27 -0700)]
wpa_supplicant: Fix wpa_drv_pktcnt_poll() call

Change-Id: I265b095235890be623090272a81e67123ff86185
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
11 years agoAdd support for Qualcomm qcwcn Wireless Connectivity solution
Jeff Johnson [Mon, 13 Aug 2012 23:54:58 +0000 (16:54 -0700)]
Add support for Qualcomm qcwcn Wireless Connectivity solution

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

11 years agowpa_supplicant: Update to BRCM version 0.8.0-36
Dmitry Shmidt [Fri, 17 Aug 2012 23:22:31 +0000 (16:22 -0700)]
wpa_supplicant: Update to BRCM version 0.8.0-36

Change-Id: Ic3f1375953f4a7c77d2208f8436d951889093397
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
11 years agoam 978afbdb: am 6f0634d6: Merge "Get rid of LOCAL_MODULE_TAGS := user"
Joe Onorato [Fri, 17 Aug 2012 07:12:14 +0000 (00:12 -0700)]
am 978afbdb: am 6f0634d6: Merge "Get rid of LOCAL_MODULE_TAGS := user"

* commit '978afbdbf1e4b5e950f419ad5c24d08cd7df1f6d':
  Get rid of LOCAL_MODULE_TAGS := user

11 years agoam 6f0634d6: Merge "Get rid of LOCAL_MODULE_TAGS := user"
Joe Onorato [Fri, 17 Aug 2012 06:55:55 +0000 (23:55 -0700)]
am 6f0634d6: Merge "Get rid of LOCAL_MODULE_TAGS := user"

* commit '6f0634d6c8d1b07cc281db15c1a63ec348ebada0':
  Get rid of LOCAL_MODULE_TAGS := user

11 years agoMerge "Get rid of LOCAL_MODULE_TAGS := user"
Joe Onorato [Fri, 17 Aug 2012 06:39:14 +0000 (23:39 -0700)]
Merge "Get rid of LOCAL_MODULE_TAGS := user"

11 years agoMerge "Add delimiter for bss command" into jb-mr1-dev
Irfan Sheriff [Mon, 13 Aug 2012 18:22:04 +0000 (11:22 -0700)]
Merge "Add delimiter for bss command" into jb-mr1-dev

11 years agoAdd delimiter for bss command
Irfan Sheriff [Mon, 13 Aug 2012 17:56:16 +0000 (10:56 -0700)]
Add delimiter for bss command

With the availability of MASK option, the number of lines per BSS is not obvious,
add a delimiter to make parsing less flaky

Bug: 2961159
Change-Id: I9e5523f8da183e0735dbc06f0c09c9f841060504

11 years agonl80211: Clean nl80211_send_frame_cmd() function
Dmitry Shmidt [Fri, 10 Aug 2012 20:46:14 +0000 (13:46 -0700)]
nl80211: Clean nl80211_send_frame_cmd() function

Change-Id: I1753151ac1a7b6f7cf48112185342faea44e8327
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
11 years agoMinor cleaning to be closer to mainstream
Jouni Malinen [Thu, 9 Aug 2012 22:29:25 +0000 (15:29 -0700)]
Minor cleaning to be closer to mainstream

Change-Id: I4aed30c59c549c2ce7488f12df4e68c6154f0ffe
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
11 years agowpa_supplicant: Update to BRCM version 0.8.0-34
Dmitry Shmidt [Wed, 8 Aug 2012 17:56:33 +0000 (10:56 -0700)]
wpa_supplicant: Update to BRCM version 0.8.0-34

- Remove interface priority
- Add action parameter to service discovery functionality

Change-Id: Ibc74c4053996e91f2f577b57695c68c86b5603c2
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
11 years agoRestore STA reconnection behavior
Irfan Sheriff [Mon, 18 Jun 2012 16:39:07 +0000 (09:39 -0700)]
Restore STA reconnection behavior

Have the customized retry behavior only for P2P & do group failure indication
beyond 5 retries

Bug: b/6674338, b/6910598
Change-Id: I58cba356ebdb7fc4eaa9bedfa417b7d5d35bb306

Conflicts:

wpa_supplicant/events.c

11 years agoMerge "Add PKTCNT_POLL command to get TX packet counters" into jb-mr1-dev
Irfan Sheriff [Fri, 3 Aug 2012 17:15:30 +0000 (10:15 -0700)]
Merge "Add PKTCNT_POLL command to get TX packet counters" into jb-mr1-dev

11 years agoAdd PKTCNT_POLL command to get TX packet counters
Yuhao Zheng [Fri, 27 Jul 2012 17:37:52 +0000 (10:37 -0700)]
Add PKTCNT_POLL command to get TX packet counters

- for the new WiFi watchdog
- requires kernel support (see issue 6874044)

Change-Id: Ibb59c1e0df6f5422814f2260588651e0e1490ccc

11 years agoMerge "Use bssid instead of pending_bssid" into jb-mr1-dev
Irfan Sheriff [Wed, 1 Aug 2012 20:01:39 +0000 (13:01 -0700)]
Merge "Use bssid instead of pending_bssid" into jb-mr1-dev

11 years agoUse bssid instead of pending_bssid
Irfan Sheriff [Wed, 1 Aug 2012 18:10:15 +0000 (11:10 -0700)]
Use bssid instead of pending_bssid

pending_bssid is not valid during roaming, use bssid

Bug: 6915644
Change-Id: Ib2181a41845f90812bd7428dbef6433adfe9f749

11 years agoGet rid of LOCAL_MODULE_TAGS := user
Joe Onorato [Tue, 22 May 2012 21:16:30 +0000 (14:16 -0700)]
Get rid of LOCAL_MODULE_TAGS := user

Change-Id: I6d9ed4e6e1d94cfedcb703eec4adfe227d35b473

11 years agoWPS : update dev.config_methods in wps_update_config.
jim1_lin [Tue, 26 Jun 2012 03:04:38 +0000 (11:04 +0800)]
WPS : update dev.config_methods in wps_update_config.

dev.config_methods was not updated when wps_update_config was called.
Led to mismatch config methods between probe_request and M1 packets.
Add missing part for it.

Change-Id: I02bd016a35726c7cf05cd71840082edd677b04b8

11 years agoam 9b7656e8: am 9a57740c: Merge "Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TI...
Brian Carlstrom [Thu, 26 Jul 2012 23:24:36 +0000 (16:24 -0700)]
am 9b7656e8: am 9a57740c: Merge "Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8 interoperability"

* commit '9b7656e824c4305c0f9a295bd1162cf05a46e2ff':
  Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8 interoperability

11 years agoam 9a57740c: Merge "Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for...
Brian Carlstrom [Thu, 26 Jul 2012 23:23:12 +0000 (16:23 -0700)]
am 9a57740c: Merge "Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8 interoperability"

* commit '9a57740cc0a2f4f2a6e72b45eebecab85532599a':
  Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8 interoperability

11 years agoMerge "Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_suppli...
Brian Carlstrom [Thu, 26 Jul 2012 22:49:01 +0000 (15:49 -0700)]
Merge "Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8 interoperability"

11 years agoUse SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8...
Brian Carlstrom [Thu, 26 Jul 2012 06:11:44 +0000 (23:11 -0700)]
Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8 interoperability

Bug: https://bugs.launchpad.net/ubuntu/+source/wpasupplicant/+bug/969343/comments/72
Bug: http://w1.fi/bugz/show_bug.cgi?id=447#c7
Bug: http://code.google.com/p/android/issues/detail?id=34212
Bug: 6883259

(cherry-picked from 27bf1073abe534644cc1146397082cc78873f516)

Change-Id: I9364e94853a404130125ab8df791193a886fdd34

11 years agoam 27bf1073: Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better...
Brian Carlstrom [Thu, 26 Jul 2012 22:20:13 +0000 (15:20 -0700)]
am 27bf1073: Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8 interoperability

* commit '27bf1073abe534644cc1146397082cc78873f516':
  Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8 interoperability

11 years agoUse SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8...
Brian Carlstrom [Thu, 26 Jul 2012 06:11:44 +0000 (23:11 -0700)]
Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8 interoperability

Bug: https://bugs.launchpad.net/ubuntu/+source/wpasupplicant/+bug/969343/comments/72
Bug: http://w1.fi/bugz/show_bug.cgi?id=447#c7
Bug: http://code.google.com/p/android/issues/detail?id=34212
Bug: 6883259
Change-Id: Ib53326cc8cd40e800454b7b92586c052bc910ba8

11 years agowpa_supplicant: Update to 07-Jul-2012 TOT
Dmitry Shmidt [Thu, 19 Jul 2012 19:16:46 +0000 (12:16 -0700)]
wpa_supplicant: Update to 07-Jul-2012 TOT

commit a5ed45586c63ffd8f9d2b44e27c251d7bacbeaf4
Author: Jouni Malinen <j@w1.fi>
Date:   Sat Jul 7 13:01:45 2012 +0300

    WPS SSDP: Fix socket leaks on error paths

Change-Id: I0864aac7fc88fa2a60f5cca7d524b94363410c85
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
11 years agowpa_supplicant: Remove snprintf call from interface= extension
Dmitry Shmidt [Mon, 16 Jul 2012 23:15:05 +0000 (16:15 -0700)]
wpa_supplicant: Remove snprintf call from interface= extension

BUG: b/6826116

Change-Id: I35023ce94152a402da94c34083de8ea1387cc758
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
11 years agoAdd 'get_capability channels' command
Dmitry Shmidt [Tue, 10 Jul 2012 19:49:30 +0000 (12:49 -0700)]
Add 'get_capability channels' command

Change-Id: Ic5d5769b80804d3e8b577e988a1caf1e149b8c01
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
12 years agoMerge "Restore STA reconnection behavior"
Irfan Sheriff [Mon, 18 Jun 2012 22:25:15 +0000 (15:25 -0700)]
Merge "Restore STA reconnection behavior"

12 years agoRestore STA reconnection behavior
Irfan Sheriff [Mon, 18 Jun 2012 16:39:07 +0000 (09:39 -0700)]
Restore STA reconnection behavior

Have the customized retry behavior only for P2P & do group failure indication
beyond 5 retries

Bug: 6674338
Change-Id: I58cba356ebdb7fc4eaa9bedfa417b7d5d35bb306

12 years agoMerge "Fix p2p service discovery" into jb-dev
Irfan Sheriff [Wed, 13 Jun 2012 20:22:59 +0000 (13:22 -0700)]
Merge "Fix p2p service discovery" into jb-dev

12 years agoFix p2p service discovery
Irfan Sheriff [Wed, 13 Jun 2012 18:09:23 +0000 (11:09 -0700)]
Fix p2p service discovery

- Fix listen timing to improve SD reliability
- Fix SD packet scheduling

Bug: 6629112
Change-Id: I01365279439116256372d019bdbfd4b2113bf2ce

12 years agoMerge "wpa_supplicant: Fix compilation without BOARD_WPA_SUPPLICANT_DRIVER" into...
Dmitry Shmidt [Mon, 11 Jun 2012 21:39:37 +0000 (14:39 -0700)]
Merge "wpa_supplicant: Fix compilation without BOARD_WPA_SUPPLICANT_DRIVER" into jb-dev

12 years agowpa_supplicant: Fix compilation without BOARD_WPA_SUPPLICANT_DRIVER
Dmitry Shmidt [Mon, 11 Jun 2012 19:51:06 +0000 (12:51 -0700)]
wpa_supplicant: Fix compilation without BOARD_WPA_SUPPLICANT_DRIVER

Change-Id: I4ee99454838185487065d3acbccf721aecf7f760
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
12 years agoFix supplicant crash at group removal
Irfan Sheriff [Wed, 6 Jun 2012 17:45:04 +0000 (10:45 -0700)]
Fix supplicant crash at group removal

Bug: 6613470
Change-Id: Ia96694ce906414b3f56cd57416d7c4c6f2030a6e

12 years agowpa_supplicant: nl80211: Fix message processing
Dmitry Shmidt [Thu, 31 May 2012 00:00:15 +0000 (17:00 -0700)]
wpa_supplicant: nl80211: Fix message processing

BUG: 6584268

Change-Id: Ib840d6b678a914be4e50d4916fecc1738b2b56f9
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
12 years agowpa_supplicant: Update to Version 0.8.27 from BRCM
Dmitry Shmidt [Wed, 30 May 2012 18:18:46 +0000 (11:18 -0700)]
wpa_supplicant: Update to Version 0.8.27 from BRCM

- Fix crash during TRUE pbc overlap
- Fix p2p_stop_find event
- Avoid race condition in GO-NEG process if both peers enter
  p2p_connect at the same time
- Retry assoc immediately on ASSOC-REJECT. Previously assoc was
  retried on authentication timeout (which occurs after 10secs).
  Now on assoc reject, we cancel the auth timer and then initiate
  a assoc scan.

BUG: 65437056427094

Change-Id: I4489fb14b6cead069f0d14fcbb9e2224f790d77b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
12 years agoFix null pointer access for SSID printing.
andy2_kuo [Tue, 22 May 2012 18:53:07 +0000 (11:53 -0700)]
Fix null pointer access for SSID printing.

Bug [Issue 6517978]

Change-Id: Ife823dce3b8b50c0c3eb0d5a2d8ecf2c8e4ac17e

12 years agowpa_supplicant: Make Android makefiles available under the BSD license
Dmitry Shmidt [Mon, 14 May 2012 20:35:02 +0000 (13:35 -0700)]
wpa_supplicant: Make Android makefiles available under the BSD license

Change-Id: I8d9e210748d582c6c5e3a62d47276c676ba74080
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
12 years agoFix SSID printing in events
Irfan Sheriff [Fri, 11 May 2012 18:23:35 +0000 (11:23 -0700)]
Fix SSID printing in events

Bug: 6476830
Change-Id: I7909fb9fb56737d0d772921d1de2849ca1296679

12 years agowpa_supplicant: Update to Version 0.8.26 from BRCM
Dmitry Shmidt [Wed, 2 May 2012 19:29:53 +0000 (12:29 -0700)]
wpa_supplicant: Update to Version 0.8.26 from BRCM

- Add interface command
- Improve scan handling during P2P

BUG: b/6324527, b/6427094

Change-Id: I4425f44d2a15de0725ba4a1b42cc56e10954b314
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
12 years agoMerge "Add SSID in supplicant change event"
Irfan Sheriff [Tue, 17 Apr 2012 02:24:40 +0000 (19:24 -0700)]
Merge "Add SSID in supplicant change event"