diff options
| author | Joe Hershberger <joe.hershberger@ni.com> | 2012-05-23 07:59:24 +0000 |
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2012-05-23 17:53:07 -0500 |
| commit | e94070c443bdc9c0231abeca920d9f9362701aec (patch) | |
| tree | 070a846a4e5ec79753f6267ada3ac09c31ed1320 /net/arp.c | |
| parent | d7310c7e63ca9ffd42527dc9735cb505cbe908b7 (diff) | |
net: Don't copy every packet that waits for an ARP
Use the NetArpTxPacket for the ARP packet, not to hold what used to
be in NetTxPacket.
This saves a copy and makes the code easier to understand.
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 | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/net/arp.c b/net/arp.c index b2993eca5c5..4a73a0fb35f 100644 --- a/net/arp.c +++ b/net/arp.c @@ -30,22 +30,22 @@ IPaddr_t NetArpWaitPacketIP; IPaddr_t NetArpWaitReplyIP; /* MAC address of waiting packet's destination */ uchar *NetArpWaitPacketMAC; -/* THE transmit packet */ -uchar *NetArpWaitTxPacket; int NetArpWaitTxPacketSize; -uchar NetArpWaitPacketBuf[PKTSIZE_ALIGN + PKTALIGN]; ulong NetArpWaitTimerStart; int NetArpWaitTry; +uchar *NetArpTxPacket; /* THE ARP transmit packet */ +uchar NetArpPacketBuf[PKTSIZE_ALIGN + PKTALIGN]; + void ArpInit(void) { /* XXX problem with bss workaround */ NetArpWaitPacketMAC = NULL; NetArpWaitPacketIP = 0; NetArpWaitReplyIP = 0; - NetArpWaitTxPacket = &NetArpWaitPacketBuf[0] + (PKTALIGN - 1); - NetArpWaitTxPacket -= (ulong)NetArpWaitTxPacket % PKTALIGN; NetArpWaitTxPacketSize = 0; + NetArpTxPacket = &NetArpPacketBuf[0] + (PKTALIGN - 1); + NetArpTxPacket -= (ulong)NetArpTxPacket % PKTALIGN; } void ArpRequest(void) @@ -56,7 +56,7 @@ void ArpRequest(void) debug("ARP broadcast %d\n", NetArpWaitTry); - pkt = NetTxPacket; + pkt = NetArpTxPacket; eth_hdr_size = NetSetEther(pkt, NetBcastAddr, PROT_ARP); pkt += eth_hdr_size; @@ -88,7 +88,7 @@ void ArpRequest(void) } NetWriteIP(&arp->ar_tpa, NetArpWaitReplyIP); - NetSendPacket(NetTxPacket, eth_hdr_size + ARP_HDR_SIZE); + NetSendPacket(NetArpTxPacket, eth_hdr_size + ARP_HDR_SIZE); } void ArpTimeoutCheck(void) @@ -196,11 +196,11 @@ void ArpReceive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) net_get_arp_handler()((uchar *)arp, 0, reply_ip_addr, 0, len); - /* modify header, and transmit it */ - memcpy(((struct ethernet_hdr *)NetArpWaitTxPacket)-> - et_dest, &arp->ar_sha, ARP_HLEN); - NetSendPacket(NetArpWaitTxPacket, - NetArpWaitTxPacketSize); + /* set the mac address in the waiting packet's header + and transmit it */ + memcpy(((struct ethernet_hdr *)NetTxPacket)->et_dest, + &arp->ar_sha, ARP_HLEN); + NetSendPacket(NetTxPacket, NetArpWaitTxPacketSize); /* no arp request pending now */ NetArpWaitPacketIP = 0; |