diff options
| author | Joe Hershberger <joe.hershberger@ni.com> | 2012-05-23 07:59:09 +0000 |
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2012-05-23 17:46:19 -0500 |
| commit | 00f33268ab02984a5fa8b3783b6096d4ce6c48c7 (patch) | |
| tree | 1d2bf41e3a7f6512f2231d65335f95845885a380 /net/arp.c | |
| parent | 9214637a56abd27863824bd53e602b7721b3cda6 (diff) | |
| download | olio-uboot-2014.01-00f33268ab02984a5fa8b3783b6096d4ce6c48c7.tar.xz olio-uboot-2014.01-00f33268ab02984a5fa8b3783b6096d4ce6c48c7.zip | |
net: Refactor packet length computations
Save the length when it is computed instead of forgetting it and
subtracting pointers to figure it out again.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Acked-by: Simon Glass <sjg@chromium.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'net/arp.c')
| -rw-r--r-- | net/arp.c | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -52,12 +52,14 @@ void ArpRequest(void) { uchar *pkt; struct arp_hdr *arp; + int eth_hdr_size; debug("ARP broadcast %d\n", NetArpWaitTry); pkt = NetTxPacket; - pkt += NetSetEther(pkt, NetBcastAddr, PROT_ARP); + eth_hdr_size = NetSetEther(pkt, NetBcastAddr, PROT_ARP); + pkt += eth_hdr_size; arp = (struct arp_hdr *) pkt; @@ -86,7 +88,7 @@ void ArpRequest(void) } NetWriteIP(&arp->ar_tpa, NetArpWaitReplyIP); - (void) eth_send(NetTxPacket, (pkt - NetTxPacket) + ARP_HDR_SIZE); + (void) eth_send(NetTxPacket, eth_hdr_size + ARP_HDR_SIZE); } void ArpTimeoutCheck(void) @@ -118,6 +120,7 @@ void ArpReceive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) struct arp_hdr *arp; IPaddr_t reply_ip_addr; uchar *pkt; + int eth_hdr_size; /* * We have to deal with two types of ARP packets: @@ -155,14 +158,14 @@ void ArpReceive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) /* reply with our IP address */ debug("Got ARP REQUEST, return our IP\n"); pkt = (uchar *)et; - pkt += NetSetEther(pkt, et->et_src, PROT_ARP); + eth_hdr_size = NetSetEther(pkt, et->et_src, PROT_ARP); + pkt += eth_hdr_size; arp->ar_op = htons(ARPOP_REPLY); memcpy(&arp->ar_tha, &arp->ar_sha, ARP_HLEN); NetCopyIP(&arp->ar_tpa, &arp->ar_spa); memcpy(&arp->ar_sha, NetOurEther, ARP_HLEN); NetCopyIP(&arp->ar_spa, &NetOurIP); - (void) eth_send((uchar *)et, - (pkt - (uchar *)et) + ARP_HDR_SIZE); + (void) eth_send((uchar *)et, eth_hdr_size + ARP_HDR_SIZE); return; case ARPOP_REPLY: /* arp reply */ |