From owner-cvs-src@FreeBSD.ORG Wed Aug 24 13:52:55 2005 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C78C816A41F; Wed, 24 Aug 2005 13:52:55 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [204.156.12.53]) by mx1.FreeBSD.org (Postfix) with ESMTP id F193043D5E; Wed, 24 Aug 2005 13:52:53 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by cyrus.watson.org (Postfix) with ESMTP id 0279A46C44; Wed, 24 Aug 2005 09:52:53 -0400 (EDT) Date: Wed, 24 Aug 2005 14:52:52 +0100 (BST) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org In-Reply-To: <200508241351.j7ODptLN045133@repoman.freebsd.org> Message-ID: <20050824145228.M11335@fledge.watson.org> References: <200508241351.j7ODptLN045133@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Subject: Re: cvs commit: src/sys/net if_arcsubr.c if_ethersubr.c if_fddisubr.c if_iso88025subr.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Aug 2005 13:52:56 -0000 Remindered by: dhartmei Thanks Daniel! Robert N M Watson On Wed, 24 Aug 2005, Robert Watson wrote: > rwatson 2005-08-24 13:51:55 UTC > > FreeBSD src repository > > Modified files: (Branch: RELENG_6) > sys/net if_arcsubr.c if_ethersubr.c if_fddisubr.c > if_iso88025subr.c > Log: > Merge if_arcsubr.c:1.26, if_ethersubr.c:1.195, if_fddisubr.c:1.99, > if_iso88025subr.c:1.68 from HEAD to RELENG_6: > > When allocating link layer ifnet address list entries in > ifp->if_resolvemulti(), do so with M_NOWAIT rather than M_WAITOK, so > that a mutex can be held over the call. In the FDDI code, add a > missing M_ZERO. Consumers are already aware that if_resolvemulti() > can fail. > > Approved by: re (scottl) > > Revision Changes Path > 1.25.2.1 +6 -2 src/sys/net/if_arcsubr.c > 1.193.2.1 +6 -2 src/sys/net/if_ethersubr.c > 1.98.2.1 +6 -2 src/sys/net/if_fddisubr.c > 1.67.2.2 +6 -2 src/sys/net/if_iso88025subr.c >