Merge branch 'master' into next

Conflicts:
	host/lib/transport/udp_zero_copy_asio.cpp

1 files changed, 15 insertions, 7 deletions

diff --git a/firmware/zpu/lib/net_common.c b/firmware/zpu/lib/net_common.c
index ec9198090..d1b06976d 100644
--- a/firmware/zpu/lib/net_common.c
+++ b/firmware/zpu/lib/net_common.c
@@ -298,20 +298,28 @@ handle_icmp_packet(struct ip_addr src, struct ip_addr dst,
     break;
 
   case ICMP_ECHO:{
+    const void *icmp_data_buff = ((uint8_t*)icmp) + sizeof(struct icmp_echo_hdr);
+    size_t icmp_data_len = len - sizeof(struct icmp_echo_hdr);
+
     struct icmp_echo_hdr echo_reply;
     echo_reply.type = 0;
     echo_reply.code = 0;
     echo_reply.chksum = 0;
     echo_reply.id = icmp->id;
     echo_reply.seqno = icmp->seqno;
-    echo_reply.chksum = ~chksum_buffer(
-        (unsigned short *)&echo_reply,
-        sizeof(echo_reply)/sizeof(short),
-    0);
+    echo_reply.chksum = ~chksum_buffer( //data checksum
+        (unsigned short *)icmp_data_buff,
+        icmp_data_len/sizeof(short),
+        chksum_buffer(                  //header checksum
+            (unsigned short *)&echo_reply,
+            sizeof(echo_reply)/sizeof(short),
+        0)
+    );
+
     send_ip_pkt(
-        src, IP_PROTO_ICMP, &echo_reply, sizeof(echo_reply),
-        ((uint8_t*)icmp) + sizeof(struct icmp_echo_hdr),
-        len - sizeof(struct icmp_echo_hdr)
+        src, IP_PROTO_ICMP,
+        &echo_reply, sizeof(echo_reply),
+        icmp_data_buff, icmp_data_len
     );
     break;
   }