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

[karo-tx-uboot.git] / net / ping.c

diff --git a/net/ping.c b/net/ping.c
index 71246de5ff87965a9474fc0565b31d73c28617d5..2be56ed929575c25c1cfa78c7c89e7da31d32be7 100644 (file)
--- a/net/ping.c
+++ b/net/ping.c
@@ -6,6 +6,7 @@
  *     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"
@@ -40,22 +41,17 @@ static void set_icmp_header(uchar *pkt, IPaddr_t dest)
 
 static int ping_send(void)
 {
-       static uchar mac[6];
        uchar *pkt;
        int eth_hdr_size;
 
        /* XXX always send arp request */
 
-       memcpy(mac, NetEtherNullAddr, 6);
-
-       debug("sending ARP for %pI4\n", &NetPingIP);
+       debug_cond(DEBUG_DEV_PKT, "sending ARP for %pI4\n", &NetPingIP);
 
        NetArpWaitPacketIP = NetPingIP;
-       NetArpWaitPacketMAC = mac;
 
-       pkt = NetArpWaitTxPacket;
-       eth_hdr_size = NetSetEther(pkt, mac, PROT_IP);
-       pkt += eth_hdr_size;
+       eth_hdr_size = NetSetEther(NetTxPacket, NetEtherNullAddr, PROT_IP);
+       pkt = (uchar *)NetTxPacket + eth_hdr_size;
 
        set_icmp_header(pkt, NetPingIP);
 
@@ -98,7 +94,7 @@ 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("Got ICMP ECHO REQUEST, return "
+               debug_cond(DEBUG_DEV_PKT, "Got ICMP ECHO REQUEST, return "
                        "%d bytes\n", eth_hdr_size + len);
 
                ip->ip_sum = 0;