From owner-p4-projects@FreeBSD.ORG  Fri Apr 21 18:45:07 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DC72916A404; Fri, 21 Apr 2006 18:45:06 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id ADCC716A400
	for <perforce@freebsd.org>; Fri, 21 Apr 2006 18:45:06 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 517E043D48
	for <perforce@freebsd.org>; Fri, 21 Apr 2006 18:45:06 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3LIj6Cm005298
	for <perforce@freebsd.org>; Fri, 21 Apr 2006 18:45:06 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3LIj6ns005295
	for perforce@freebsd.org; Fri, 21 Apr 2006 18:45:06 GMT
	(envelope-from imp@freebsd.org)
Date: Fri, 21 Apr 2006 18:45:06 GMT
Message-Id: <200604211845.k3LIj6ns005295@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 95815 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Apr 2006 18:45:07 -0000

http://perforce.freebsd.org/chv.cgi?CH=95815

Change 95815 by imp@imp_hammer on 2006/04/21 18:44:38

	Save 64 bytes by storing the serverPort in network byte order,
	rather than in host order and constantly swapping them...

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#7 edit

Differences ...

==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#7 (text+ko) ====

@@ -148,7 +148,7 @@
 	udpHdr = (udp_header_t*)(ipHdr + 1);
 
 	udpHdr->src_port  = SWAP16(localPort);
-	udpHdr->dst_port  = SWAP16(serverPort);
+	udpHdr->dst_port  = serverPort;
 	udpHdr->udp_len   = SWAP16(8 + tftpLength);
 	udpHdr->udp_cksum = 0;
 
@@ -332,12 +332,12 @@
 
 			if (ackBlock == -1) {
 				if (SWAP16(tftpHdr->block_num) != 1)
-						break;
-					serverPort = SWAP16(udpHdr->src_port);
-					ackBlock = 0;
-				}
+					break;
+				serverPort = udpHdr->src_port;
+				ackBlock = 0;
+			}
 
-			if (serverPort != SWAP16(udpHdr->src_port))
+			if (serverPort != udpHdr->src_port)
 				break;
 
 			TFTP_ACK_Data(tftpHdr->data,
@@ -595,7 +595,7 @@
 	state = TFTP_WAITING_SERVER_MAC;
 	timeout = 10;
 	thisSeconds = GetSeconds();
-	serverPort = 69;
+	serverPort = SWAP16(69);
 	++localPort;
 	ackBlock = -1;