svn commit: r306922 - stable/11/sys/netinet

[Julien Charbon]

Author: jch
Date: Sun Oct  9 21:02:33 2016
New Revision: 306922
URL: https://svnweb.freebsd.org/changeset/base/306922

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/11/sys/netinet/tcp_syncache.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/netinet/tcp_syncache.c
==============================================================================
--- stable/11/sys/netinet/tcp_syncache.c	Sun Oct  9 21:00:49 2016	(r306921)
+++ stable/11/sys/netinet/tcp_syncache.c	Sun Oct  9 21:02:33 2016	(r306922)
@@ -918,7 +918,9 @@ syncache_socket(struct syncache *sc, str
 	tp->t_keepcnt = sototcpcb(lso)->t_keepcnt;
 	tcp_timer_activate(tp, TT_KEEP, TP_KEEPINIT(tp));
 
-	soisconnected(so);
+	if ((so->so_options & SO_ACCEPTFILTER) == 0) {
+		soisconnected(so);
+	}
 
 	TCPSTAT_INC(tcps_accepts);
 	return (so);