From owner-svn-src-stable@FreeBSD.ORG  Mon Jun 24 09:25:39 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 49C7DFB0;
 Mon, 24 Jun 2013 09:25:39 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3C70918A9;
 Mon, 24 Jun 2013 09:25:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5O9Pd45011866;
 Mon, 24 Jun 2013 09:25:39 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5O9Pdab011865;
 Mon, 24 Jun 2013 09:25:39 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201306240925.r5O9Pdab011865@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Mon, 24 Jun 2013 09:25:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r252151 - stable/9/lib/libnetgraph
X-SVN-Group: stable-9
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.14
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/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Jun 2013 09:25:39 -0000

Author: glebius
Date: Mon Jun 24 09:25:38 2013
New Revision: 252151
URL: http://svnweb.freebsd.org/changeset/base/252151

Log:
  Merge r248159:
    Fix for quite a special case when userland emulates a netgraph node, and
    userland can reply to a message with NGM_HASREPLY bit set. In this case
    we should not wait for a response to a responce.
  
    PR:           176771
    Submitted by: Keith Reynolds <keith.reynolds tidalscale.com>

Modified:
  stable/9/lib/libnetgraph/msg.c
Directory Properties:
  stable/9/lib/libnetgraph/   (props changed)

Modified: stable/9/lib/libnetgraph/msg.c
==============================================================================
--- stable/9/lib/libnetgraph/msg.c	Mon Jun 24 09:23:24 2013	(r252150)
+++ stable/9/lib/libnetgraph/msg.c	Mon Jun 24 09:25:38 2013	(r252151)
@@ -234,7 +234,7 @@ NgDeliverMsg(int cs, const char *path,
 	}
 
 	/* Wait for reply if there should be one. */
-	if (msg->header.cmd & NGM_HASREPLY) {
+	if (msg->header.cmd & NGM_HASREPLY && !(msg->header.flags & NGF_RESP)) {
 		struct pollfd rfds;
 		int n;