Merge "[Bugfix][T106BUG-479]Fix that the AT port has no output and cannot input"
diff --git a/ap/app/zte_comm/at_ctl/src/atctrl/at_com.c b/ap/app/zte_comm/at_ctl/src/atctrl/at_com.c
index 116a4b5..7811261 100755
--- a/ap/app/zte_comm/at_ctl/src/atctrl/at_com.c
+++ b/ap/app/zte_comm/at_ctl/src/atctrl/at_com.c
@@ -630,8 +630,11 @@
written_bytes = write(fd, pstr, left_len);
if(written_bytes <= 0)
{
- //ºË¼äͨµÀдʧ°Ü£¬ÖØ·¢
- if(at_chan && at_chan->attribution & (1<<CH_COMM))
+ if(written_bytes == 0){
+ at_print(AT_ERR,"====>at_sys_write written_bytes=0, fd=%d\n", fd);
+ return 0;
+ }
+ else if(at_chan && at_chan->attribution & (1<<CH_COMM))
{
if(resendcnt > 10)
{
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/dhcp6/dhcp6s.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/dhcp6/dhcp6s.c
index c4d4b16..db6a967 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/dhcp6/dhcp6s.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/dhcp6/dhcp6s.c
@@ -355,11 +355,11 @@
exit(1);
}
if (num_device != 0) {
- {
+ /*{
char tmp_buf[128] = {0};
snprintf(tmp_buf, sizeof(tmp_buf),"nv set %s_dhcp6s_pid=%d", device[0], getpid());
system(tmp_buf);
- }
+ }*/
for (i = 0; i < num_device; i++) {
ifidx[i] = if_nametoindex(device[i]);
if (ifidx[i] == 0) {