From 85d25e0e7630a61bdbf2d4e8b1991e3cc6c96d65 Mon Sep 17 00:00:00 2001 From: Joe Hershberger Date: Wed, 8 Apr 2015 01:41:08 -0500 Subject: net: cosmetic: Clean up ARP variables and functions Make a thorough pass through all variables and function names contained within arp and remove CamelCase and improve naming. Signed-off-by: Joe Hershberger Acked-by: Simon Glass --- net/net.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'net/net.c') diff --git a/net/net.c b/net/net.c index b8acbb4..9a4290b 100644 --- a/net/net.c +++ b/net/net.c @@ -302,7 +302,7 @@ void net_init(void) net_rx_packets[i] = net_tx_packet + (i + 1) * PKTSIZE_ALIGN; } - ArpInit(); + arp_init(); net_clear_handlers(); /* Only need to setup buffer pointers once. */ @@ -495,7 +495,7 @@ restart: goto done; } - ArpTimeoutCheck(); + arp_timeout_check(); /* * Check for a timeout, and run the timeout handler @@ -733,15 +733,15 @@ int net_send_udp_packet(uchar *ether, struct in_addr dest, int dport, int sport, /* save the ip and eth addr for the packet to send after arp */ net_arp_wait_packet_ip = dest; - NetArpWaitPacketMAC = ether; + arp_wait_packet_ethaddr = ether; /* size of the waiting packet */ - NetArpWaitTxPacketSize = pkt_hdr_size + payload_len; + arp_wait_tx_packet_size = pkt_hdr_size + payload_len; /* 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 */ } else { debug_cond(DEBUG_DEV_PKT, "sending UDP to %pI4/%pM\n", @@ -1059,7 +1059,7 @@ void net_process_received_packet(uchar *in_packet, int len) switch (eth_proto) { case PROT_ARP: - ArpReceive(et, ip, len); + arp_receive(et, ip, len); break; #ifdef CONFIG_CMD_RARP -- cgit v1.1