From owner-svn-src-stable-10@freebsd.org  Thu Mar  2 17:17:07 2017
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id AE506CF5FB0;
 Thu,  2 Mar 2017 17:17:07 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7AF13809;
 Thu,  2 Mar 2017 17:17:07 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v22HH6PO092019;
 Thu, 2 Mar 2017 17:17:06 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v22HH6Nv092018;
 Thu, 2 Mar 2017 17:17:06 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201703021717.v22HH6Nv092018@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 2 Mar 2017 17:17:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r314560 - stable/10/contrib/tcpdump
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Mar 2017 17:17:07 -0000

Author: emaste
Date: Thu Mar  2 17:17:06 2017
New Revision: 314560
URL: https://svnweb.freebsd.org/changeset/base/314560

Log:
  MFC r309649 (oshogbo): tcpdump: allow to use BIOCROTZBUF in capability mode
  
  The libpcap library can use a BIOCROTZBUF ioctl when net.bpf.zerocopy_enable
  sysctl is set.
  
  PR:		217490

Modified:
  stable/10/contrib/tcpdump/tcpdump.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/tcpdump/tcpdump.c
==============================================================================
--- stable/10/contrib/tcpdump/tcpdump.c	Thu Mar  2 17:09:14 2017	(r314559)
+++ stable/10/contrib/tcpdump/tcpdump.c	Thu Mar  2 17:17:06 2017	(r314560)
@@ -1554,7 +1554,7 @@ main(int argc, char **argv)
 		error("%s", pcap_geterr(pd));
 #ifdef __FreeBSD__
 	if (RFileName == NULL && VFileName == NULL) {
-		static const unsigned long cmds[] = { BIOCGSTATS };
+		static const unsigned long cmds[] = { BIOCGSTATS, BIOCROTZBUF };
 
 		/*
 		 * The various libpcap devices use a combination of