diff options
| author | Irfan Sheriff <isheriff@google.com> | 2012-10-12 11:58:01 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-12 11:58:02 -0700 |
| commit | c4c58b249e02c944f05107398f1d32e3c41e28d1 (patch) | |
| tree | 18726a22268df3533dd5cba83e99482522e828e6 | |
| parent | abc55c698301e05a80d7f9394c75abca0b307602 (diff) | |
| parent | 897f6dd64224d22c22c8f7a497331bf5bc335e4c (diff) | |
| download | hardware_libhardware_legacy-c4c58b249e02c944f05107398f1d32e3c41e28d1.zip hardware_libhardware_legacy-c4c58b249e02c944f05107398f1d32e3c41e28d1.tar.gz hardware_libhardware_legacy-c4c58b249e02c944f05107398f1d32e3c41e28d1.tar.bz2 | |
Merge "Fix native crash" into jb-mr1-dev
| -rw-r--r-- | wifi/wifi.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/wifi/wifi.c b/wifi/wifi.c index cd9bf65..f669693 100644 --- a/wifi/wifi.c +++ b/wifi/wifi.c @@ -727,10 +727,10 @@ int wifi_ctrl_recv(int index, char *reply, size_t *reply_len) } if (rfds[0].revents & POLLIN) { return wpa_ctrl_recv(monitor_conn[index], reply, reply_len); - } else { - return -2; + } else if (rfds[1].revents & POLLIN) { + wifi_close_sockets(index); } - return 0; + return -2; } int wifi_wait_on_socket(int index, char *buf, size_t buflen) @@ -837,9 +837,9 @@ void wifi_close_supplicant_connection(const char *ifname) * STA connection does not need it since supplicant gets shutdown */ TEMP_FAILURE_RETRY(write(exit_sockets[SECONDARY][0], "T", 1)); - wifi_close_sockets(SECONDARY); - //closing p2p connection does not need a wait on - //supplicant stop + /* p2p sockets are closed after the monitor thread + * receives the terminate on the exit socket + */ return; } |