diff mbox

[U-Boot,v2,13/25] net: cosmetic: Clean up ping variables and functions

Message ID 1428475285-25836-14-git-send-email-joe.hershberger@ni.com
State Accepted
Delegated to: Simon Glass
Headers show

Commit Message

Joe Hershberger April 8, 2015, 6:41 a.m. UTC 
Make a thorough pass through all variables and function names contained
within ping.c and remove CamelCase and improve naming.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---

Changes in v2: None

 net/ping.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

Comments

Simon Glass April 8, 2015, 12:46 p.m. UTC | #1 
On 8 April 2015 at 00:41, Joe Hershberger <joe.hershberger@ni.com> wrote:
> Make a thorough pass through all variables and function names contained
> within ping.c and remove CamelCase and improve naming.
>
> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
> ---
>
> Changes in v2: None
>
>  net/ping.c | 13 +++++++------
>  1 file changed, 7 insertions(+), 6 deletions(-)

Acked-by: Simon Glass <sjg@chromium.org>
Simon Glass April 8, 2015, 2:37 p.m. UTC | #2 
On 8 April 2015 at 06:46, Simon Glass <sjg@chromium.org> wrote:
> On 8 April 2015 at 00:41, Joe Hershberger <joe.hershberger@ni.com> wrote:
>> Make a thorough pass through all variables and function names contained
>> within ping.c and remove CamelCase and improve naming.
>>
>> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
>> ---
>>
>> Changes in v2: None
>>
>>  net/ping.c | 13 +++++++------
>>  1 file changed, 7 insertions(+), 6 deletions(-)
>
> Acked-by: Simon Glass <sjg@chromium.org>

Applied to u-boot-dm/next, thanks!
diff mbox

Patch

diff --git a/net/ping.c b/net/ping.c
index 76e8749..87da555 100644
--- a/net/ping.c
+++ b/net/ping.c
@@ -12,7 +12,7 @@ 
 #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);
 }
 
@@ -65,7 +65,7 @@  static int ping_send(void)
 	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);
+	NetSetTimeout(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;