From owner-svn-src-head@FreeBSD.ORG  Thu Jun 28 20:10:44 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 284D61065675;
	Thu, 28 Jun 2012 20:10:44 +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 136628FC1D;
	Thu, 28 Jun 2012 20:10:44 +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 q5SKAh3x096247;
	Thu, 28 Jun 2012 20:10:43 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5SKAhTN096244;
	Thu, 28 Jun 2012 20:10:43 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201206282010.q5SKAhTN096244@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 28 Jun 2012 20:10:43 +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: r237729 - head/tools/tools/netmap
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Jun 2012 20:10:44 -0000

Author: emaste
Date: Thu Jun 28 20:10:43 2012
New Revision: 237729
URL: http://svn.freebsd.org/changeset/base/237729

Log:
  Fix ioctl type for compiling with clang

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

Modified: head/tools/tools/netmap/bridge.c
==============================================================================
--- head/tools/tools/netmap/bridge.c	Thu Jun 28 19:55:46 2012	(r237728)
+++ head/tools/tools/netmap/bridge.c	Thu Jun 28 20:10:43 2012	(r237729)
@@ -79,7 +79,7 @@ sigint_h(__unused int sig)
 
 
 static int
-do_ioctl(struct my_ring *me, int what)
+do_ioctl(struct my_ring *me, unsigned long what)
 {
 	struct ifreq ifr;
 	int error;
@@ -98,7 +98,7 @@ do_ioctl(struct my_ring *me, int what)
 	}
 	error = ioctl(me->fd, what, &ifr);
 	if (error) {
-		D("ioctl error %d", what);
+		D("ioctl error 0x%lx", what);
 		return error;
 	}
 	switch (what) {

Modified: head/tools/tools/netmap/pcap.c
==============================================================================
--- head/tools/tools/netmap/pcap.c	Thu Jun 28 19:55:46 2012	(r237728)
+++ head/tools/tools/netmap/pcap.c	Thu Jun 28 20:10:43 2012	(r237729)
@@ -201,7 +201,7 @@ struct my_ring {
 
 
 static int
-do_ioctl(struct my_ring *me, int what)
+do_ioctl(struct my_ring *me, unsigned long what)
 {
 	struct ifreq ifr;
 	int error;
@@ -221,7 +221,7 @@ do_ioctl(struct my_ring *me, int what)
 	}
 	error = ioctl(me->fd, what, &ifr);
 	if (error) {
-		D("ioctl 0x%x error %d", what, error);
+		D("ioctl 0x%lx error %d", what, error);
 		return error;
 	}
 	switch (what) {