From owner-cvs-src@FreeBSD.ORG  Thu Dec 22 16:23:27 2005
Return-Path: <owner-cvs-src@FreeBSD.ORG>
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 EA5C116A41F;
	Thu, 22 Dec 2005 16:23:27 +0000 (GMT)
	(envelope-from emaste@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 27F5A43D55;
	Thu, 22 Dec 2005 16:23:27 +0000 (GMT)
	(envelope-from emaste@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 jBMGNRNR024383;
	Thu, 22 Dec 2005 16:23:27 GMT
	(envelope-from emaste@repoman.freebsd.org)
Received: (from emaste@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBMGNRVO024382;
	Thu, 22 Dec 2005 16:23:27 GMT (envelope-from emaste)
Message-Id: <200512221623.jBMGNRVO024382@repoman.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 22 Dec 2005 16:23:27 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_5
Cc: 
Subject: 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 <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Dec 2005 16:23:28 -0000

emaste      2005-12-22 16:23:27 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_5)
    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_5:
  
    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:    scottl
  Silcence from:  rwatson (mentor)
  
  Revision   Changes    Path
  1.22.2.2   +6 -2      src/sys/net/if_arcsubr.c
  1.177.2.9  +6 -2      src/sys/net/if_ethersubr.c
  1.95.2.2   +6 -2      src/sys/net/if_fddisubr.c
  1.65.2.3   +6 -2      src/sys/net/if_iso88025subr.c