From owner-cvs-all@FreeBSD.ORG  Fri Aug 11 19:41:51 2006
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id DCD9D16A4DD;
	Fri, 11 Aug 2006 19:41:51 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9A93443D46;
	Fri, 11 Aug 2006 19:41:51 +0000 (GMT) (envelope-from jhb@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7BJfpvM010072;
	Fri, 11 Aug 2006 19:41:51 GMT (envelope-from jhb@repoman.freebsd.org)
Received: (from jhb@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7BJfpfO010071;
	Fri, 11 Aug 2006 19:41:51 GMT (envelope-from jhb)
Message-Id: <200608111941.k7BJfpfO010071@repoman.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 11 Aug 2006 19:41:51 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/sys/netncp ncp_sock.c src/sys/netsmb smb_trantcp.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Aug 2006 19:41:52 -0000

jhb         2006-08-11 19:41:51 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/netncp           ncp_sock.c 
    sys/netsmb           smb_trantcp.c 
  Log:
  MFC:
  - Fix ncp_poll() to not panic by faking up enough poll(2) state in the
    current thread.
  - Fix the rselect() routines for netncp and netsmb to return EWOULDBLOCK
    if the timeout is elapsed before they can block and to invoke
    pru_sopoll() directly.
  
  Revision  Changes    Path
  1.15.2.1  +27 -7     src/sys/netncp/ncp_sock.c
  1.22.2.1  +7 -11     src/sys/netsmb/smb_trantcp.c