tpm: Drop two unused options

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

diff --git a/net/ping.c b/net/ping.c
index 2be56ed929575c25c1cfa78c7c89e7da31d32be7..9508cf1160ea048b03bc715c8b7599f5f71ceff7 100644 (file)
--- a/net/ping.c
+++ b/net/ping.c
@@ -12,12 +12,12 @@
 #include "ping.h"
 #include "arp.h"
 
-static ushort PingSeqNo;
+static ushort ping_seq_number;
 
 /* The ip address to ping */
-IPaddr_t NetPingIP;
+struct in_addr net_ping_ip;
 
-static void set_icmp_header(uchar *pkt, IPaddr_t dest)
+static void set_icmp_header(uchar *pkt, struct in_addr dest)
 {
        /*
         *      Construct an IP and ICMP header.
@@ -25,18 +25,18 @@ static void set_icmp_header(uchar *pkt, IPaddr_t dest)
        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, NetOurIP);
+       net_set_ip_header(pkt, dest, net_ip);
 
        ip->ip_len   = htons(IP_ICMP_HDR_SIZE);
        ip->ip_p     = IPPROTO_ICMP;
-       ip->ip_sum   = ~NetCksum((uchar *)ip, IP_HDR_SIZE >> 1);
+       ip->ip_sum   = compute_ip_checksum(ip, IP_HDR_SIZE);
 
        icmp->type = ICMP_ECHO_REQUEST;
        icmp->code = 0;
        icmp->checksum = 0;
        icmp->un.echo.id = 0;
-       icmp->un.echo.sequence = htons(PingSeqNo++);
-       icmp->checksum = ~NetCksum((uchar *)icmp, ICMP_HDR_SIZE >> 1);
+       icmp->un.echo.sequence = htons(ping_seq_number++);
+       icmp->checksum = compute_ip_checksum(icmp, ICMP_HDR_SIZE);
 }
 
 static int ping_send(void)
@@ -46,26 +46,26 @@ static int ping_send(void)
 
        /* XXX always send arp request */
 
-       debug_cond(DEBUG_DEV_PKT, "sending ARP for %pI4\n", &NetPingIP);
+       debug_cond(DEBUG_DEV_PKT, "sending ARP for %pI4\n", &net_ping_ip);
 
-       NetArpWaitPacketIP = NetPingIP;
+       net_arp_wait_packet_ip = net_ping_ip;
 
-       eth_hdr_size = NetSetEther(NetTxPacket, NetEtherNullAddr, PROT_IP);
-       pkt = (uchar *)NetTxPacket + eth_hdr_size;
+       eth_hdr_size = net_set_ether(net_tx_packet, net_null_ethaddr, PROT_IP);
+       pkt = (uchar *)net_tx_packet + eth_hdr_size;
 
-       set_icmp_header(pkt, NetPingIP);
+       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();
 }
@@ -82,33 +82,32 @@ void ping_start(void)
 void ping_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len)
 {
        struct icmp_hdr *icmph = (struct icmp_hdr *)&ip->udp_src;
-       IPaddr_t src_ip;
+       struct in_addr src_ip;
        int eth_hdr_size;
 
        switch (icmph->type) {
        case ICMP_ECHO_REPLY:
-               src_ip = NetReadIP((void *)&ip->ip_src);
-               if (src_ip == NetPingIP)
+               src_ip = net_read_ip((void *)&ip->ip_src);
+               if (src_ip.s_addr == net_ping_ip.s_addr)
                        net_set_state(NETLOOP_SUCCESS);
                return;
        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;
-               NetCopyIP((void *)&ip->ip_dst, &ip->ip_src);
-               NetCopyIP((void *)&ip->ip_src, &NetOurIP);
-               ip->ip_sum = ~NetCksum((uchar *)ip,
-                                      IP_HDR_SIZE >> 1);
+               net_copy_ip((void *)&ip->ip_dst, &ip->ip_src);
+               net_copy_ip((void *)&ip->ip_src, &net_ip);
+               ip->ip_sum = compute_ip_checksum(ip, IP_HDR_SIZE);
 
                icmph->type = ICMP_ECHO_REPLY;
                icmph->checksum = 0;
-               icmph->checksum = ~NetCksum((uchar *)icmph,
-                       (len - IP_HDR_SIZE) >> 1);
-               NetSendPacket((uchar *)et, eth_hdr_size + len);
+               icmph->checksum = compute_ip_checksum(icmph, len - IP_HDR_SIZE);
+               net_send_packet((uchar *)et, eth_hdr_size + len);
                return;
 /*     default:
                return;*/