From owner-svn-src-all@FreeBSD.ORG  Sat Mar 21 23:13:48 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E5F3F1065674;
	Sat, 21 Mar 2009 23:13:48 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D26918FC2D;
	Sat, 21 Mar 2009 23:13:48 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2LNDmtc050147;
	Sat, 21 Mar 2009 23:13:48 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2LNDmru050146;
	Sat, 21 Mar 2009 23:13:48 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200903212313.n2LNDmru050146@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Sat, 21 Mar 2009 23:13:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190230 - head/contrib/libpcap
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Mar 2009 23:13:50 -0000

Author: rpaulo
Date: Sat Mar 21 23:13:48 2009
New Revision: 190230
URL: http://svn.freebsd.org/changeset/base/190230

Log:
  Remove remaining references to BIOCSETBUFMODE ifdefs. We now have
  another ifdef for zerocopy bpf.

Modified:
  head/contrib/libpcap/pcap-bpf.c

Modified: head/contrib/libpcap/pcap-bpf.c
==============================================================================
--- head/contrib/libpcap/pcap-bpf.c	Sat Mar 21 23:08:04 2009	(r190229)
+++ head/contrib/libpcap/pcap-bpf.c	Sat Mar 21 23:13:48 2009	(r190230)
@@ -93,10 +93,6 @@ static int odmlockid = 0;
 
 #endif /* _AIX */
 
-#ifdef BIOCSETBUFMODE
-#include <machine/atomic.h>
-#endif
-
 #include <ctype.h>
 #include <errno.h>
 #include <netdb.h>
@@ -1893,9 +1889,6 @@ pcap_activate_bpf(pcap_t *p)
 			goto bad;
 		}
 	}
-#ifdef BIOCSETBUFMODE
-	p->timeout = to_ms;
-#endif
 
 #ifdef _AIX
 #ifdef	BIOCIMMEDIATE