Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / net / ping.c

diff --git a/net/ping.c b/net/ping.c
index 7c6084c3e37825d5187c876fa7728cbf17fc1693..3e5461a36a02b2d1f41c857dc8d39aaabf440823 100644 (file)
--- a/net/ping.c
+++ b/net/ping.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *     Copied from Linux Monitor (LiMon) - Networking.
  *
@@ -6,13 +7,12 @@
  *     Copyright 2000 Roland Borde
  *     Copyright 2000 Paolo Scaffardi
  *     Copyright 2000-2002 Wolfgang Denk, wd@denx.de
- *     SPDX-License-Identifier:        GPL-2.0
  */
 
 #include "ping.h"
 #include "arp.h"
 
-static ushort PingSeqNo;
+static ushort ping_seq_number;
 
 /* The ip address to ping */
 struct in_addr net_ping_ip;
@@ -35,7 +35,7 @@ static void set_icmp_header(uchar *pkt, struct in_addr dest)
        icmp->code = 0;
        icmp->checksum = 0;
        icmp->un.echo.id = 0;
-       icmp->un.echo.sequence = htons(PingSeqNo++);
+       icmp->un.echo.sequence = htons(ping_seq_number++);
        icmp->checksum = compute_ip_checksum(icmp, ICMP_HDR_SIZE);
 }
 
@@ -56,16 +56,16 @@ static int ping_send(void)
        set_icmp_header(pkt, net_ping_ip);
 
        /* size of the waiting packet */
-       NetArpWaitTxPacketSize = eth_hdr_size + IP_ICMP_HDR_SIZE;
+       arp_wait_tx_packet_size = eth_hdr_size + IP_ICMP_HDR_SIZE;
 
        /* and do the ARP request */
-       NetArpWaitTry = 1;
-       NetArpWaitTimerStart = get_timer(0);
-       ArpRequest();
+       arp_wait_try = 1;
+       arp_wait_timer_start = get_timer(0);
+       arp_request();
        return 1;       /* waiting */
 }
 
-static void ping_timeout(void)
+static void ping_timeout_handler(void)
 {
        eth_halt();
        net_set_state(NETLOOP_FAIL);    /* we did not get the reply */
@@ -74,7 +74,7 @@ static void ping_timeout(void)
 void ping_start(void)
 {
        printf("Using %s device\n", eth_get_name());
-       NetSetTimeout(10000UL, ping_timeout);
+       net_set_timeout_handler(10000UL, ping_timeout_handler);
 
        ping_send();
 }
@@ -94,8 +94,9 @@ void ping_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len)
        case ICMP_ECHO_REQUEST:
                eth_hdr_size = net_update_ether(et, et->et_src, PROT_IP);
 
-               debug_cond(DEBUG_DEV_PKT, "Got ICMP ECHO REQUEST, return "
-                       "%d bytes\n", eth_hdr_size + len);
+               debug_cond(DEBUG_DEV_PKT,
+                          "Got ICMP ECHO REQUEST, return %d bytes\n",
+                          eth_hdr_size + len);
 
                ip->ip_sum = 0;
                ip->ip_off = 0;
@@ -106,7 +107,8 @@ 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);
+               memcpy(net_tx_packet, et, eth_hdr_size + len);
+               net_send_packet(net_tx_packet, eth_hdr_size + len);
                return;
 /*     default:
                return;*/