From 00f33268ab02984a5fa8b3783b6096d4ce6c48c7 Mon Sep 17 00:00:00 2001 From: Joe Hershberger Date: Wed, 23 May 2012 07:59:09 +0000 Subject: 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 Acked-by: Simon Glass Acked-by: Mike Frysinger --- net/ping.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'net/ping.c') diff --git a/net/ping.c b/net/ping.c index c525635669..939f8ff6fc 100644 --- a/net/ping.c +++ b/net/ping.c @@ -42,6 +42,7 @@ static int ping_send(void) { static uchar mac[6]; uchar *pkt; + int eth_hdr_size; /* XXX always send arp request */ @@ -53,13 +54,13 @@ static int ping_send(void) NetArpWaitPacketMAC = mac; pkt = NetArpWaitTxPacket; - pkt += NetSetEther(pkt, mac, PROT_IP); + eth_hdr_size = NetSetEther(pkt, mac, PROT_IP); + pkt += eth_hdr_size; set_icmp_header(pkt, NetPingIP); /* size of the waiting packet */ - NetArpWaitTxPacketSize = - (pkt - NetArpWaitTxPacket) + IP_HDR_SIZE + 8; + NetArpWaitTxPacketSize = eth_hdr_size + IP_ICMP_HDR_SIZE; /* and do the ARP request */ NetArpWaitTry = 1; -- cgit v1.2.1