From owner-cvs-all@FreeBSD.ORG Sat Jun 3 04:34:05 2006 Return-Path: X-Original-To: cvs-all@FreeBSD.org 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 7E40716A420; Sat, 3 Jun 2006 04:34:05 +0000 (UTC) (envelope-from benno@FreeBSD.org) Received: from mail.jeamland.net (rafe.jeamland.net [202.45.126.103]) by mx1.FreeBSD.org (Postfix) with ESMTP id F3EDF43D45; Sat, 3 Jun 2006 04:34:04 +0000 (GMT) (envelope-from benno@FreeBSD.org) Received: from mail.jeamland.net (localhost [127.0.0.1]) by mail.jeamland.net (Postfix) with ESMTP id 7562C1CD32; Sat, 3 Jun 2006 14:34:01 +1000 (EST) Received: from [10.2.3.17] (ppp71-73.lns1.mel4.internode.on.net [59.167.71.73]) by mail.jeamland.net (Postfix) with ESMTP id 6D8381CD60; Sat, 3 Jun 2006 14:33:56 +1000 (EST) Message-ID: <4481112F.5080807@FreeBSD.org> Date: Sat, 03 Jun 2006 14:33:51 +1000 From: Benno Rice User-Agent: Thunderbird 1.5.0.2 (Macintosh/20060308) MIME-Version: 1.0 To: "Christian S.J. Peron" References: <200606021959.k52JxXlr022148@repoman.freebsd.org> In-Reply-To: <200606021959.k52JxXlr022148@repoman.freebsd.org> Content-Type: multipart/mixed; boundary="------------030502080208070809030700" X-Virus-Scanned: ClamAV using ClamSMTP at rafe.jeamland.net Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/dev/ath if_ath.c src/sys/dev/ipw if_ipw.c src/sys/dev/iwi if_iwi.c src/sys/dev/ral rt2560.c rt2661.c src/sys/dev/usb if_ural.c src/sys/dev/wi if_wi.c src/sys/net bpf.c bpf.h bpfdesc.h if_disc.c if_gif.c if_gre.c if_loop.c if_sl.c ... X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 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, 03 Jun 2006 04:34:05 -0000 This is a multi-part message in MIME format. --------------030502080208070809030700 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Christian S.J. Peron wrote: [snip] > Log: > Fix the following bpf(4) race condition which can result in a panic: [snip] This change causes panics in kernels that don't have device bpf present. The attached patch fixes this. -- Benno Rice benno@FreeBSD.org --------------030502080208070809030700 Content-Type: text/plain; x-mac-type="0"; x-mac-creator="0"; name="bpf.h.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="bpf.h.diff" Index: bpf.h =================================================================== RCS file: /home/ncvs/src/sys/net/bpf.h,v retrieving revision 1.41 diff -u -r1.41 bpf.h --- bpf.h 2 Jun 2006 19:59:32 -0000 1.41 +++ bpf.h 3 Jun 2006 04:31:10 -0000 @@ -630,7 +630,11 @@ bpf_peers_present(struct bpf_if *bpf) { +#if defined(DEV_BPF) || defined(NETGRAPH_BPF) return !LIST_EMPTY(&bpf->bif_dlist); +#else + return (0); +#endif } #define BPF_TAP(_ifp,_pkt,_pktlen) do { \ --------------030502080208070809030700--