From owner-svn-src-all@freebsd.org  Wed Jan 18 17:09:23 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 B8950CB69FC;
 Wed, 18 Jan 2017 17:09:23 +0000 (UTC)
 (envelope-from glebius@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 8839010BD;
 Wed, 18 Jan 2017 17:09:23 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0IH9Mog038973;
 Wed, 18 Jan 2017 17:09:22 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0IH9M5M038972;
 Wed, 18 Jan 2017 17:09:22 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201701181709.v0IH9M5M038972@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Wed, 18 Jan 2017 17:09:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r312387 - head/sys/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Jan 2017 17:09:23 -0000

Author: glebius
Date: Wed Jan 18 17:09:22 2017
New Revision: 312387
URL: https://svnweb.freebsd.org/changeset/base/312387

Log:
  Fix regression from r311568: collision of MSG_NOSIGNAL with MSG_MORETOCOME
  lead to delayed send of data sent with sendto(MSG_NOSIGNAL).
  
  Submitted by:	rrs

Modified:
  head/sys/sys/socket.h

Modified: head/sys/sys/socket.h
==============================================================================
--- head/sys/sys/socket.h	Wed Jan 18 15:23:40 2017	(r312386)
+++ head/sys/sys/socket.h	Wed Jan 18 17:09:22 2017	(r312387)
@@ -446,7 +446,7 @@ struct msghdr {
 #endif
 #ifdef _KERNEL
 #define	MSG_SOCALLBCK   0x10000		/* for use by socket callbacks - soreceive (TCP) */
-#define	MSG_MORETOCOME	0x20000		/* additional data pending */
+#define	MSG_MORETOCOME	0x100000	/* additional data pending */
 #endif
 
 /*