From owner-svn-src-stable@freebsd.org  Sun Oct  9 21:35:13 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B2114C0B208;
 Sun,  9 Oct 2016 21:35:13 +0000 (UTC) (envelope-from jch@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 8196CE64;
 Sun,  9 Oct 2016 21:35:13 +0000 (UTC) (envelope-from jch@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u99LZCm6024907;
 Sun, 9 Oct 2016 21:35:12 GMT (envelope-from jch@FreeBSD.org)
Received: (from jch@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u99LZCTR024906;
 Sun, 9 Oct 2016 21:35:12 GMT (envelope-from jch@FreeBSD.org)
Message-Id: <201610092135.u99LZCTR024906@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jch set sender to jch@FreeBSD.org
 using -f
From: Julien Charbon <jch@FreeBSD.org>
Date: Sun, 9 Oct 2016 21:35:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r306925 - stable/10/sys/netinet
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Oct 2016 21:35:13 -0000

Author: jch
Date: Sun Oct  9 21:35:12 2016
New Revision: 306925
URL: https://svnweb.freebsd.org/changeset/base/306925

Log:
  MFC r306443:
  
  Fix an issue with accept_filter introduced with r261242:
  
  As a side effect of r261242 when using accept_filter the
  first call to soisconnected() is done earlier in tcp_input()
  instead of tcp_do_segment() context.  Restore the expected behaviour.
  
  Note:  This call to soisconnected() seems to be extraneous in all
  cases (with or without accept_filter).  Will be addressed in a
  separate commit.
  
  PR:			212920
  Reported by:		Alexey
  Tested by:		Alexey, jch
  Sponsored by:		Verisign, Inc.

Modified:
  stable/10/sys/netinet/tcp_syncache.c

Modified: stable/10/sys/netinet/tcp_syncache.c
==============================================================================
--- stable/10/sys/netinet/tcp_syncache.c	Sun Oct  9 21:28:56 2016	(r306924)
+++ stable/10/sys/netinet/tcp_syncache.c	Sun Oct  9 21:35:12 2016	(r306925)
@@ -922,7 +922,9 @@ syncache_socket(struct syncache *sc, str
 
 	INP_WUNLOCK(inp);
 
-	soisconnected(so);
+	if ((so->so_options & SO_ACCEPTFILTER) == 0) {
+		soisconnected(so);
+	}
 
 	TCPSTAT_INC(tcps_accepts);
 	return (so);