From owner-cvs-all@FreeBSD.ORG Sat Oct 23 19:18:06 2004 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 2AE6816A4CE; Sat, 23 Oct 2004 19:18:06 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 081F943D1F; Sat, 23 Oct 2004 19:18:06 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9NJI5jX017933; Sat, 23 Oct 2004 19:18:05 GMT (envelope-from rwatson@repoman.freebsd.org) Received: (from rwatson@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9NJI5Zc017932; Sat, 23 Oct 2004 19:18:05 GMT (envelope-from rwatson) Message-Id: <200410231918.i9NJI5Zc017932@repoman.freebsd.org> From: Robert Watson Date: Sat, 23 Oct 2004 19:18:05 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_5_3 Subject: cvs commit: src/sys/net if.c if_var.h 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: Sat, 23 Oct 2004 19:18:06 -0000 rwatson 2004-10-23 19:18:05 UTC FreeBSD src repository Modified files: (Branch: RELENG_5_3) sys/net if.c if_var.h Log: Merge if.c:1.210, if_var.h:1.85 from HEAD to RELENG_5_3: Define IFF_LOCKGIANT() and IFF_UNLOCKGIANT() macros, which conditionally acquire Giant if the passed interface has IFF_NEEDSGIANT set on it. Modify calls into (ifp)->if_ioctl() in if.c to use these macros in order to ensure that Giant is held. MFC after: 3 days Bumped into by: jmg Approved by: re (kensmith, scottl) Revision Changes Path 1.199.2.7.2.1 +30 -2 src/sys/net/if.c 1.84.4.1 +10 -0 src/sys/net/if_var.h