From owner-cvs-all@FreeBSD.ORG Fri Feb 25 17:57:30 2005 Return-Path: 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 75B1E16A4CE; Fri, 25 Feb 2005 17:57:30 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4020A43D60; Fri, 25 Feb 2005 17:57:30 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1PHvUa8092316; Fri, 25 Feb 2005 17:57:30 GMT (envelope-from rwatson@repoman.freebsd.org) Received: (from rwatson@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1PHvU5U092315; Fri, 25 Feb 2005 17:57:30 GMT (envelope-from rwatson) Message-Id: <200502251757.j1PHvU5U092315@repoman.freebsd.org> From: Robert Watson Date: Fri, 25 Feb 2005 17:57:30 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_5 Subject: cvs commit: src/sys/kern uipc_socket.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2005 17:57:30 -0000 rwatson 2005-02-25 17:57:30 UTC FreeBSD src repository Modified files: (Branch: RELENG_5) sys/kern uipc_socket.c Log: Merge uipc_socket.c:1.232 from HEAD to RELENG_5: In soreceive(), when considering delivery to a socket in SS_ISCONFIRMING, only call the protocol's pru_rcvd() if the protocol has the flag PR_WANTRCVD set. This brings that instance of pru_rcvd() into line with the rest, which do check the flag. Revision Changes Path 1.208.2.16 +2 -1 src/sys/kern/uipc_socket.c