From owner-p4-projects@FreeBSD.ORG Wed Feb 7 04:55:38 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 BD8BD16A406; Wed, 7 Feb 2007 04:55:24 +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 146BB16A403 for ; Wed, 7 Feb 2007 04:55:24 +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 E104213C481 for ; Wed, 7 Feb 2007 04:55:23 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l174tNFH080877 for ; Wed, 7 Feb 2007 04:55:23 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l174tNVf080853 for perforce@freebsd.org; Wed, 7 Feb 2007 04:55:23 GMT (envelope-from csjp@freebsd.org) Date: Wed, 7 Feb 2007 04:55:23 GMT Message-Id: <200702070455.l174tNVf080853@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 114151 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: Wed, 07 Feb 2007 04:55:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=114151 Change 114151 by csjp@csjp_rnd01 on 2007/02/07 04:54:29 Dont bother using BIOCSRTIMEOUT in the zerocopy case, all it can do is cause problems. Affected files ... .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#6 edit Differences ... ==== //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#6 (text+ko) ==== @@ -1048,7 +1048,7 @@ #endif /* set timeout */ p->to_ms = to_ms; - if (to_ms != 0) { + if (to_ms != 0 && getenv("BPF_ZERO_COPY") == NULL) { /* * XXX - is this seconds/nanoseconds in AIX? * (Treating it as such doesn't fix the timeout