From owner-svn-src-head@freebsd.org  Tue Oct 10 00:32:22 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 96609E40427;
 Tue, 10 Oct 2017 00:32:22 +0000 (UTC)
 (envelope-from sbruno@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 65CE7255D;
 Tue, 10 Oct 2017 00:32:22 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9A0WLiV069346;
 Tue, 10 Oct 2017 00:32:21 GMT (envelope-from sbruno@FreeBSD.org)
Received: (from sbruno@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9A0WLCa069345;
 Tue, 10 Oct 2017 00:32:21 GMT (envelope-from sbruno@FreeBSD.org)
Message-Id: <201710100032.v9A0WLCa069345@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sbruno set sender to
 sbruno@FreeBSD.org using -f
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Tue, 10 Oct 2017 00:32:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r324459 - head/sys/kern
X-SVN-Group: head
X-SVN-Commit-Author: sbruno
X-SVN-Commit-Paths: head/sys/kern
X-SVN-Commit-Revision: 324459
X-SVN-Commit-Repository: base
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.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Oct 2017 00:32:22 -0000

Author: sbruno
Date: Tue Oct 10 00:32:21 2017
New Revision: 324459
URL: https://svnweb.freebsd.org/changeset/base/324459

Log:
  Revert r324405 at the request of the submitter pending better solution.
  
  Submitted by:	Jason Eggleston <jason@eggnet.com>
  Sponsored by:	Limelight Networks

Modified:
  head/sys/kern/kern_sendfile.c

Modified: head/sys/kern/kern_sendfile.c
==============================================================================
--- head/sys/kern/kern_sendfile.c	Tue Oct 10 00:26:44 2017	(r324458)
+++ head/sys/kern/kern_sendfile.c	Tue Oct 10 00:32:21 2017	(r324459)
@@ -507,11 +507,6 @@ sendfile_getsock(struct thread *td, int s, struct file
 	*so = (*sock_fp)->f_data;
 	if ((*so)->so_type != SOCK_STREAM)
 		return (EINVAL);
-	if ((*so)->so_error) {
-		error = (*so)->so_error;
-		(*so)->so_error = 0;
-		return (error);
-	}
 	if (((*so)->so_state & SS_ISCONNECTED) == 0)
 		return (ENOTCONN);
 	return (0);