From owner-svn-src-all@FreeBSD.ORG  Tue Sep  4 20:51:25 2012
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 A90C11065678;
	Tue,  4 Sep 2012 20:51:25 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 953378FC18;
	Tue,  4 Sep 2012 20:51:25 +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 q84KpPSN017084;
	Tue, 4 Sep 2012 20:51:25 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q84KpPip017082;
	Tue, 4 Sep 2012 20:51:25 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201209042051.q84KpPip017082@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 4 Sep 2012 20:51:25 +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: r240103 - 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: Tue, 04 Sep 2012 20:51:25 -0000

Author: emaste
Date: Tue Sep  4 20:51:25 2012
New Revision: 240103
URL: http://svn.freebsd.org/changeset/base/240103

Log:
  Failure to open netmap device is unrecoverable.
  
  There's no reason to "fail later" since there's nothing this tool can do in
  netmap mode without /dev/netmap open.

Modified:
  head/tools/tools/netmap/pkt-gen.c

Modified: head/tools/tools/netmap/pkt-gen.c
==============================================================================
--- head/tools/tools/netmap/pkt-gen.c	Tue Sep  4 20:45:59 2012	(r240102)
+++ head/tools/tools/netmap/pkt-gen.c	Tue Sep  4 20:51:25 2012	(r240103)
@@ -892,7 +892,7 @@ main(int arc, char **argv)
 	fd = open("/dev/netmap", O_RDWR);
 	if (fd == -1) {
 		D("Unable to open /dev/netmap");
-		// fail later
+		exit(1);
 	} else {
 		if ((ioctl(fd, NIOCGINFO, &nmr)) == -1) {
 			D("Unable to get if info without name");