From owner-svn-src-all@FreeBSD.ORG  Fri Apr  6 14:26:06 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 35C611065673;
	Fri,  6 Apr 2012 14:26:06 +0000 (UTC)
	(envelope-from luigi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 20D968FC16;
	Fri,  6 Apr 2012 14:26:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q36EQ5Ow012593;
	Fri, 6 Apr 2012 14:26:05 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q36EQ5Ni012591;
	Fri, 6 Apr 2012 14:26:05 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201204061426.q36EQ5Ni012591@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Fri, 6 Apr 2012 14:26:05 +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: r233947 - head/tools/tools/netmap
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: Fri, 06 Apr 2012 14:26:06 -0000

Author: luigi
Date: Fri Apr  6 14:26:05 2012
New Revision: 233947
URL: http://svn.freebsd.org/changeset/base/233947

Log:
  we need to specify a NETMAP_API version or the ioctl() will fail.

Modified:
  head/tools/tools/netmap/pcap.c

Modified: head/tools/tools/netmap/pcap.c
==============================================================================
--- head/tools/tools/netmap/pcap.c	Fri Apr  6 13:34:19 2012	(r233946)
+++ head/tools/tools/netmap/pcap.c	Fri Apr  6 14:26:05 2012	(r233947)
@@ -232,6 +232,7 @@ netmap_open(struct my_ring *me, int ring
 	bzero(&req, sizeof(req));
 	strncpy(req.nr_name, me->nmr.nr_name, sizeof(req.nr_name));
 	req.nr_ringid = ringid;
+	req.nr_version = NETMAP_API;
 	err = ioctl(fd, NIOCGINFO, &req);
 	if (err) {
 		D("cannot get info on %s", me->nmr.nr_name);