diff options
| author | Chih-Wei Huang <cwhuang@linux.org.tw> | 2010-09-09 15:19:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-09 15:19:56 -0700 |
| commit | c875bb384f1c17aa198262acd72b18825f7d8152 (patch) | |
| tree | 96222ae3a04cb98e6b5e7f1e35293a2d57861c2d | |
| parent | bab20b6759d9f0445e4ff5f27f0a3666f0efafa5 (diff) | |
| parent | 709a302e77c44a3e3ee8359be3f2c9361f05d02c (diff) | |
| download | hardware_libhardware_legacy-c875bb384f1c17aa198262acd72b18825f7d8152.zip hardware_libhardware_legacy-c875bb384f1c17aa198262acd72b18825f7d8152.tar.gz hardware_libhardware_legacy-c875bb384f1c17aa198262acd72b18825f7d8152.tar.bz2 | |
am 709a302e: wifi: pass interface to wpa_supplicant
Merge commit '709a302e77c44a3e3ee8359be3f2c9361f05d02c' into gingerbread-plus-aosp
* commit '709a302e77c44a3e3ee8359be3f2c9361f05d02c':
wifi: pass interface to wpa_supplicant
| -rw-r--r-- | wifi/wifi.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/wifi/wifi.c b/wifi/wifi.c index 3f8708d..9a2cbbd 100644 --- a/wifi/wifi.c +++ b/wifi/wifi.c @@ -271,6 +271,7 @@ int ensure_config_file_exists() int wifi_start_supplicant() { + char daemon_cmd[PROPERTY_VALUE_MAX]; char supp_status[PROPERTY_VALUE_MAX] = {'\0'}; int count = 200; /* wait at most 20 seconds for completion */ #ifdef HAVE_LIBC_SYSTEM_PROPERTIES @@ -306,7 +307,9 @@ int wifi_start_supplicant() serial = pi->serial; } #endif - property_set("ctl.start", SUPPLICANT_NAME); + property_get("wifi.interface", iface, WIFI_TEST_INTERFACE); + snprintf(daemon_cmd, PROPERTY_VALUE_MAX, "%s:-i%s", SUPPLICANT_NAME, iface); + property_set("ctl.start", daemon_cmd); sched_yield(); while (count-- > 0) { @@ -370,8 +373,6 @@ int wifi_connect_to_supplicant() return -1; } - property_get("wifi.interface", iface, WIFI_TEST_INTERFACE); - if (access(IFACE_DIR, F_OK) == 0) { snprintf(ifname, sizeof(ifname), "%s/%s", IFACE_DIR, iface); } else { |