From owner-p4-projects@FreeBSD.ORG Sat Apr 7 21:21:18 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2433316A404; Sat, 7 Apr 2007 21:21:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CC6F316A401 for ; Sat, 7 Apr 2007 21:21:17 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BDC9F13C45A for ; Sat, 7 Apr 2007 21:21:17 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l37LLHfn040800 for ; Sat, 7 Apr 2007 21:21:17 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l37LLHTq040797 for perforce@freebsd.org; Sat, 7 Apr 2007 21:21:17 GMT (envelope-from csjp@freebsd.org) Date: Sat, 7 Apr 2007 21:21:17 GMT Message-Id: <200704072121.l37LLHTq040797@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 117607 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Apr 2007 21:21:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=117607 Change 117607 by csjp@csjp_push on 2007/04/07 21:21:11 - Change unconditonal Giant aquisition to depend on the status mpsafe.net - Add NET_LOCK_GIANT around a call into the ifnet layer's ioctl Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.c#20 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.c#20 (text+ko) ==== @@ -1032,8 +1032,10 @@ if (d->bd_bif == NULL) error = EINVAL; else { + NET_LOCK_GIANT(); ifp = d->bd_bif->bif_ifp; error = (*ifp->if_ioctl)(ifp, cmd, addr); + NET_UNLOCK_GIANT(); } break; } @@ -1081,9 +1083,9 @@ break; } if (d->bd_promisc == 0) { - mtx_lock(&Giant); + NET_LOCK_GIANT(); error = ifpromisc(d->bd_bif->bif_ifp, 1); - mtx_unlock(&Giant); + NET_UNLOCK_GIANT(); if (error == 0) d->bd_promisc = 1; }