From 21d957796dd7413e5f050c86b841077b2a204a54 Mon Sep 17 00:00:00 2001
From: Joe Hershberger <joe.hershberger@ni.com>
Date: Wed, 8 Apr 2015 01:41:11 -0500
Subject: [PATCH] net: cosmetic: Clean up RARP variables and functions

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

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Acked-by: Simon Glass <sjg@chromium.org>
---
 net/net.c  |  4 ++--
 net/rarp.c | 23 +++++++++++------------
 net/rarp.h |  6 +++---
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/net/net.c b/net/net.c
index 320039add5..bd92806ba4 100644
--- a/net/net.c
+++ b/net/net.c
@@ -395,9 +395,9 @@ restart:
 
 #if defined(CONFIG_CMD_RARP)
 		case RARP:
-			RarpTry = 0;
+			rarp_try = 0;
 			net_ip.s_addr = 0;
-			RarpRequest();
+			rarp_request();
 			break;
 #endif
 #if defined(CONFIG_CMD_PING)
diff --git a/net/rarp.c b/net/rarp.c
index f50d2fbd9d..204e03cf28 100644
--- a/net/rarp.c
+++ b/net/rarp.c
@@ -20,7 +20,7 @@
 #define TIMEOUT_COUNT (CONFIG_NET_RETRY_COUNT)
 #endif
 
-int RarpTry;
+int rarp_try;
 
 /*
  *	Handle a RARP received packet.
@@ -37,10 +37,9 @@ void rarp_receive(struct ip_udp_hdr *ip, unsigned len)
 	}
 
 	if ((ntohs(arp->ar_op) != RARPOP_REPLY) ||
-		(ntohs(arp->ar_hrd) != ARP_ETHER)   ||
-		(ntohs(arp->ar_pro) != PROT_IP)     ||
-		(arp->ar_hln != 6) || (arp->ar_pln != 4)) {
-
+	    (ntohs(arp->ar_hrd) != ARP_ETHER)   ||
+	    (ntohs(arp->ar_pro) != PROT_IP)     ||
+	    (arp->ar_hln != 6) || (arp->ar_pln != 4)) {
 		puts("invalid RARP header\n");
 	} else {
 		net_copy_ip(&net_ip, &arp->ar_data[16]);
@@ -56,25 +55,25 @@ void rarp_receive(struct ip_udp_hdr *ip, unsigned len)
 /*
  *	Timeout on BOOTP request.
  */
-static void RarpTimeout(void)
+static void rarp_timeout_handler(void)
 {
-	if (RarpTry >= TIMEOUT_COUNT) {
+	if (rarp_try >= TIMEOUT_COUNT) {
 		puts("\nRetry count exceeded; starting again\n");
 		NetStartAgain();
 	} else {
-		NetSetTimeout(TIMEOUT, RarpTimeout);
-		RarpRequest();
+		NetSetTimeout(TIMEOUT, rarp_timeout_handler);
+		rarp_request();
 	}
 }
 
 
-void RarpRequest(void)
+void rarp_request(void)
 {
 	uchar *pkt;
 	struct arp_hdr *rarp;
 	int eth_hdr_size;
 
-	printf("RARP broadcast %d\n", ++RarpTry);
+	printf("RARP broadcast %d\n", ++rarp_try);
 	pkt = net_tx_packet;
 
 	eth_hdr_size = net_set_ether(pkt, net_bcast_ethaddr, PROT_RARP);
@@ -96,5 +95,5 @@ void RarpRequest(void)
 
 	net_send_packet(net_tx_packet, eth_hdr_size + ARP_HDR_SIZE);
 
-	NetSetTimeout(TIMEOUT, RarpTimeout);
+	NetSetTimeout(TIMEOUT, rarp_timeout_handler);
 }
diff --git a/net/rarp.h b/net/rarp.h
index 93e18899c3..1ca8833ce5 100644
--- a/net/rarp.h
+++ b/net/rarp.h
@@ -17,11 +17,11 @@
  *	Global functions and variables.
  */
 
-extern int RarpTry;
+extern int rarp_try;
 
 /* Process the receipt of a RARP packet */
-extern void rarp_receive(struct ip_udp_hdr *ip, unsigned len);
-extern void RarpRequest(void);	/* Send a RARP request */
+void rarp_receive(struct ip_udp_hdr *ip, unsigned len);
+void rarp_request(void);	/* Send a RARP request */
 
 /**********************************************************************/
 
-- 
2.39.2