From owner-svn-src-stable@FreeBSD.ORG  Tue Oct 11 14:39:20 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4DEEB106566C;
	Tue, 11 Oct 2011 14:39:20 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3D1E48FC15;
	Tue, 11 Oct 2011 14:39:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9BEdKeY019733;
	Tue, 11 Oct 2011 14:39:20 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9BEdK5I019731;
	Tue, 11 Oct 2011 14:39:20 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201110111439.p9BEdK5I019731@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Tue, 11 Oct 2011 14:39:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226260 - stable/8/sys/netinet
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Oct 2011 14:39:20 -0000

Author: attilio
Date: Tue Oct 11 14:39:19 2011
New Revision: 226260
URL: http://svn.freebsd.org/changeset/base/226260

Log:
  MFC r226060:
  Skip TCP_SIGNATURE calculation for INP_TIMEWAIT case.
  
  Sponsored by:	Sandvine Incorporated

Modified:
  stable/8/sys/netinet/tcp_input.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/netinet/tcp_input.c
==============================================================================
--- stable/8/sys/netinet/tcp_input.c	Tue Oct 11 14:05:39 2011	(r226259)
+++ stable/8/sys/netinet/tcp_input.c	Tue Oct 11 14:39:19 2011	(r226260)
@@ -902,24 +902,8 @@ relocked:
 		}
 		INP_INFO_WLOCK_ASSERT(&V_tcbinfo);
 
-#ifdef TCP_SIGNATURE
-		tcp_dooptions(&to, optp, optlen,
-		    (thflags & TH_SYN) ? TO_SYN : 0);
-		if (sig_checked == 0) {
-			tp = intotcpcb(inp);
-			if (tp == NULL || tp->t_state == TCPS_CLOSED) {
-				rstreason = BANDLIM_RST_CLOSEDPORT;
-				goto dropwithreset;
-			}
-			if (!tcp_signature_verify_input(m, off0, tlen, optlen,
-			    &to, th, tp->t_flags))
-				goto dropunlock;
-			sig_checked = 1;
-		}
-#else
 		if (thflags & TH_SYN)
 			tcp_dooptions(&to, optp, optlen, TO_SYN);
-#endif
 		/*
 		 * NB: tcp_twcheck unlocks the INP and frees the mbuf.
 		 */