diff options
author | Joe Hershberger <joe.hershberger@ni.com> | 2015-04-08 01:41:04 -0500 |
---|---|---|
committer | Simon Glass <sjg@chromium.org> | 2015-04-18 11:11:32 -0600 |
commit | 0adb5b761f4c789ae47d8abb015f5e017263d3f2 (patch) | |
tree | 84f951f300ae9d8d0a48c9ab14f11c9c1ecef477 /net/arp.c | |
parent | 586cbe51ab8ef357bcf3a52c6885ab00bc7293dd (diff) |
net: cosmetic: Name ethaddr variables consistently
Use "_ethaddr" at the end of variables and drop CamelCase.
Make constant values actually 'const'.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'net/arp.c')
-rw-r--r-- | net/arp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/arp.c b/net/arp.c index 4971a53612f..c613609b2d0 100644 --- a/net/arp.c +++ b/net/arp.c @@ -60,7 +60,7 @@ void arp_raw_request(struct in_addr source_ip, const uchar *targetEther, pkt = NetArpTxPacket; - eth_hdr_size = NetSetEther(pkt, NetBcastAddr, PROT_ARP); + eth_hdr_size = NetSetEther(pkt, net_bcast_ethaddr, PROT_ARP); pkt += eth_hdr_size; arp = (struct arp_hdr *) pkt; @@ -71,7 +71,7 @@ void arp_raw_request(struct in_addr source_ip, const uchar *targetEther, arp->ar_pln = ARP_PLEN; arp->ar_op = htons(ARPOP_REQUEST); - memcpy(&arp->ar_sha, NetOurEther, ARP_HLEN); /* source ET addr */ + memcpy(&arp->ar_sha, net_ethaddr, ARP_HLEN); /* source ET addr */ net_write_ip(&arp->ar_spa, source_ip); /* source IP addr */ memcpy(&arp->ar_tha, targetEther, ARP_HLEN); /* target ET addr */ net_write_ip(&arp->ar_tpa, target_ip); /* target IP addr */ @@ -93,7 +93,7 @@ void ArpRequest(void) net_arp_wait_reply_ip = net_arp_wait_packet_ip; } - arp_raw_request(net_ip, NetEtherNullAddr, net_arp_wait_reply_ip); + arp_raw_request(net_ip, net_null_ethaddr, net_arp_wait_reply_ip); } void ArpTimeoutCheck(void) @@ -168,7 +168,7 @@ void ArpReceive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) arp->ar_op = htons(ARPOP_REPLY); memcpy(&arp->ar_tha, &arp->ar_sha, ARP_HLEN); net_copy_ip(&arp->ar_tpa, &arp->ar_spa); - memcpy(&arp->ar_sha, NetOurEther, ARP_HLEN); + memcpy(&arp->ar_sha, net_ethaddr, ARP_HLEN); net_copy_ip(&arp->ar_spa, &net_ip); #ifdef CONFIG_CMD_LINK_LOCAL |