[Feature][ZXW-241]merge P56U01 version
Only Configure: No
Affected branch: master
Affected module: unknow
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No
Change-Id: I7985538dde6951dd824c36149bf9a1e3ca23c734
diff --git a/ap/app/clatd/clatd.c b/ap/app/clatd/clatd.c
index a1552d2..a5cd0a9 100755
--- a/ap/app/clatd/clatd.c
+++ b/ap/app/clatd/clatd.c
@@ -403,7 +403,10 @@
// If any other bit is set, assume it's due to an error (i.e. POLLERR).
if (wait_fd[0].revents & ~POLLIN) {
// ring_read doesn't clear the error indication on the socket.
- recv(tunnel->read_fd6, NULL, 0, MSG_PEEK);
+ if(recv(tunnel->read_fd6, NULL, 0, MSG_PEEK) == -1)
+ {
+ logmsg_dbg(ANDROID_LOG_ERROR,"recv fd6 failed");
+ }
logmsg(ANDROID_LOG_WARN, "event_loop: clearing error on read_fd6: %s",
strerror(errno));
}