From owner-svn-src-head@FreeBSD.ORG  Mon Nov 17 14:56:03 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 49422CC3;
 Mon, 17 Nov 2014 14:56:03 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 356BDFA7;
 Mon, 17 Nov 2014 14:56:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAHEu3P6001749;
 Mon, 17 Nov 2014 14:56:03 GMT (envelope-from jch@FreeBSD.org)
Received: (from jch@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAHEu3VB001748;
 Mon, 17 Nov 2014 14:56:03 GMT (envelope-from jch@FreeBSD.org)
Message-Id: <201411171456.sAHEu3VB001748@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jch set sender to jch@FreeBSD.org
 using -f
From: Julien Charbon <jch@FreeBSD.org>
Date: Mon, 17 Nov 2014 14:56:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r274629 - head/sys/netinet
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Nov 2014 14:56:03 -0000

Author: jch
Date: Mon Nov 17 14:56:02 2014
New Revision: 274629
URL: https://svnweb.freebsd.org/changeset/base/274629

Log:
  Re-introduce padding fields removed with r264321 to keep
  struct tcptw ABI unchanged.
  
  Suggested by:	jhb
  Approved by:	jhb (mentor)
  MFC after:	1 day
  X-MFC-With:	r264321

Modified:
  head/sys/netinet/tcp_var.h

Modified: head/sys/netinet/tcp_var.h
==============================================================================
--- head/sys/netinet/tcp_var.h	Mon Nov 17 14:45:42 2014	(r274628)
+++ head/sys/netinet/tcp_var.h	Mon Nov 17 14:56:02 2014	(r274629)
@@ -357,6 +357,8 @@ struct tcptw {
 	u_int		t_starttime;
 	int		tw_time;
 	TAILQ_ENTRY(tcptw) tw_2msl;
+	void		*tw_pspare;	/* TCP_SIGNATURE */
+	u_int		*tw_spare;	/* TCP_SIGNATURE */
 };
 
 #define	intotcpcb(ip)	((struct tcpcb *)(ip)->inp_ppcb)