Skip to content
Snippets Groups Projects
Commit 331db5a9 authored by Joe Hershberger's avatar Joe Hershberger Committed by Simon Glass
Browse files

net: cosmetic: Clean up ping variables and functions


Make a thorough pass through all variables and function names contained
within ping.c and remove CamelCase and improve naming.

Signed-off-by: default avatarJoe Hershberger <joe.hershberger@ni.com>
Acked-by: default avatarSimon Glass <sjg@chromium.org>
parent 38ba2558
No related branches found
No related tags found
No related merge requests found
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include "ping.h" #include "ping.h"
#include "arp.h" #include "arp.h"
static ushort PingSeqNo; static ushort ping_seq_number;
/* The ip address to ping */ /* The ip address to ping */
struct in_addr net_ping_ip; struct in_addr net_ping_ip;
...@@ -35,7 +35,7 @@ static void set_icmp_header(uchar *pkt, struct in_addr dest) ...@@ -35,7 +35,7 @@ static void set_icmp_header(uchar *pkt, struct in_addr dest)
icmp->code = 0; icmp->code = 0;
icmp->checksum = 0; icmp->checksum = 0;
icmp->un.echo.id = 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); icmp->checksum = compute_ip_checksum(icmp, ICMP_HDR_SIZE);
} }
...@@ -65,7 +65,7 @@ static int ping_send(void) ...@@ -65,7 +65,7 @@ static int ping_send(void)
return 1; /* waiting */ return 1; /* waiting */
} }
static void ping_timeout(void) static void ping_timeout_handler(void)
{ {
eth_halt(); eth_halt();
net_set_state(NETLOOP_FAIL); /* we did not get the reply */ net_set_state(NETLOOP_FAIL); /* we did not get the reply */
...@@ -74,7 +74,7 @@ static void ping_timeout(void) ...@@ -74,7 +74,7 @@ static void ping_timeout(void)
void ping_start(void) void ping_start(void)
{ {
printf("Using %s device\n", eth_get_name()); printf("Using %s device\n", eth_get_name());
NetSetTimeout(10000UL, ping_timeout); NetSetTimeout(10000UL, ping_timeout_handler);
ping_send(); ping_send();
} }
...@@ -94,8 +94,9 @@ void ping_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) ...@@ -94,8 +94,9 @@ void ping_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len)
case ICMP_ECHO_REQUEST: case ICMP_ECHO_REQUEST:
eth_hdr_size = net_update_ether(et, et->et_src, PROT_IP); eth_hdr_size = net_update_ether(et, et->et_src, PROT_IP);
debug_cond(DEBUG_DEV_PKT, "Got ICMP ECHO REQUEST, return " debug_cond(DEBUG_DEV_PKT,
"%d bytes\n", eth_hdr_size + len); "Got ICMP ECHO REQUEST, return %d bytes\n",
eth_hdr_size + len);
ip->ip_sum = 0; ip->ip_sum = 0;
ip->ip_off = 0; ip->ip_off = 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment