From owner-p4-projects@FreeBSD.ORG  Tue Apr  1 20:05:39 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 736A710656F1; Tue,  1 Apr 2008 20:05:38 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8AB7F106566B
	for <perforce@freebsd.org>; Tue,  1 Apr 2008 20:05:38 +0000 (UTC)
	(envelope-from andre@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7A9958FC14
	for <perforce@freebsd.org>; Tue,  1 Apr 2008 20:05:38 +0000 (UTC)
	(envelope-from andre@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m31K5cZZ099236
	for <perforce@freebsd.org>; Tue, 1 Apr 2008 20:05:38 GMT
	(envelope-from andre@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m31K5cel099234
	for perforce@freebsd.org; Tue, 1 Apr 2008 20:05:38 GMT
	(envelope-from andre@freebsd.org)
Date: Tue, 1 Apr 2008 20:05:38 GMT
Message-Id: <200804012005.m31K5cel099234@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	andre@freebsd.org using -f
From: Andre Oppermann <andre@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 139156 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: Tue, 01 Apr 2008 20:05:40 -0000

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

Change 139156 by andre@andre_flirtbox on 2008/04/01 20:05:14

	Use #defines for tcp options padding.

Affected files ...

.. //depot/projects/tcp_reass/netinet/tcp.h#3 edit
.. //depot/projects/tcp_reass/netinet/tcp_output.c#4 edit

Differences ...

==== //depot/projects/tcp_reass/netinet/tcp.h#3 (text+ko) ====

@@ -78,6 +78,8 @@
 
 #define	TCPOPT_EOL		0
 #define	   TCPOLEN_EOL			1
+#define	TCPOPT_PAD		0
+#define	   TCPOLEN_PAD			1
 #define	TCPOPT_NOP		1
 #define	   TCPOLEN_NOP			1
 #define	TCPOPT_MAXSEG		2

==== //depot/projects/tcp_reass/netinet/tcp_output.c#4 (text+ko) ====

@@ -1384,8 +1384,8 @@
 	 * people with padding of EOLs.
 	 */
 	while (optlen % 4) {
-		optlen += 1;
-		*optp++ = 0x00;
+		optlen += TCPOLEN_PAD;
+		*optp++ = TCPOPT_PAD;
 	}
 
 	KASSERT(optlen <= TCP_MAXOLEN, ("%s: TCP options too long", __func__));