Merge tag 'efi-2020-07-rc6' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

[oweals/u-boot.git] / net / ping.c

diff --git a/net/ping.c b/net/ping.c
index 5464f2f785fed0c195f81c11a320cd7abad38d77..0e33660f6c5faf8db51940826491c256d7c685ba 100644 (file)
--- a/net/ping.c
+++ b/net/ping.c
@@ -11,6 +11,8 @@
 
 #include "ping.h"
 #include "arp.h"
+#include <log.h>
+#include <net.h>
 
 static ushort ping_seq_number;
 
@@ -22,14 +24,9 @@ static void set_icmp_header(uchar *pkt, struct in_addr dest)
        /*
         *      Construct an IP and ICMP header.
         */
-       struct ip_hdr *ip = (struct ip_hdr *)pkt;
        struct icmp_hdr *icmp = (struct icmp_hdr *)(pkt + IP_HDR_SIZE);
 
-       net_set_ip_header(pkt, dest, net_ip);
-
-       ip->ip_len   = htons(IP_ICMP_HDR_SIZE);
-       ip->ip_p     = IPPROTO_ICMP;
-       ip->ip_sum   = compute_ip_checksum(ip, IP_HDR_SIZE);
+       net_set_ip_header(pkt, dest, net_ip, IP_ICMP_HDR_SIZE, IPPROTO_ICMP);
 
        icmp->type = ICMP_ECHO_REQUEST;
        icmp->code = 0;
@@ -84,6 +81,7 @@ void ping_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len)
        struct icmp_hdr *icmph = (struct icmp_hdr *)&ip->udp_src;
        struct in_addr src_ip;
        int eth_hdr_size;
+       uchar *tx_packet;
 
        switch (icmph->type) {
        case ICMP_ECHO_REPLY:
@@ -107,7 +105,10 @@ void ping_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len)
                icmph->type = ICMP_ECHO_REPLY;
                icmph->checksum = 0;
                icmph->checksum = compute_ip_checksum(icmph, len - IP_HDR_SIZE);
-               net_send_packet((uchar *)et, eth_hdr_size + len);
+
+               tx_packet = net_get_async_tx_pkt_buf();
+               memcpy(tx_packet, et, eth_hdr_size + len);
+               net_send_packet(tx_packet, eth_hdr_size + len);
                return;
 /*     default:
                return;*/