From owner-svn-src-user@FreeBSD.ORG  Fri Jan 22 09:50:18 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 15DFB106566B;
	Fri, 22 Jan 2010 09:50:18 +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 04C7C8FC19;
	Fri, 22 Jan 2010 09:50:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0M9oHZm028129;
	Fri, 22 Jan 2010 09:50:17 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0M9oHrG028127;
	Fri, 22 Jan 2010 09:50:17 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201001220950.o0M9oHrG028127@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Fri, 22 Jan 2010 09:50:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r202795 - user/luigi/ipfw3-head/sys/netinet/ipfw
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Jan 2010 09:50:18 -0000

Author: luigi
Date: Fri Jan 22 09:50:17 2010
New Revision: 202795
URL: http://svn.freebsd.org/changeset/base/202795

Log:
  use uintptr_t for list of objects (helps with alignment,
  though a bit of a waste of space)

Modified:
  user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dummynet.c

Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dummynet.c
==============================================================================
--- user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dummynet.c	Fri Jan 22 09:49:07 2010	(r202794)
+++ user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dummynet.c	Fri Jan 22 09:50:17 2010	(r202795)
@@ -848,10 +848,9 @@ copy_fsk_list(struct copy_args *a, struc
 	int n = 0, space = sizeof(*o);
 	SLIST_FOREACH(fs, &s->fsk_list, sch_chain) {
 		if (fs->fs.fs_nr < DN_MAX_ID)
-			n++;;
+			n++;
 	}
-	/* XXX beware the alignment */
-	space += 2*n;
+	space += n * sizeof(uintptr_t);
 	D("sched %d has %d flowsets", s->sch.sched_nr, n);
 	if (a->end - *(a->start) < space)
 		return DNHT_SCAN_END;
@@ -1322,7 +1321,7 @@ do_config(void *p, int l)
 	struct dn_id *next, *o;
 	int err = 0, err2 = 0;
 	struct dn_id *arg = NULL;
-	uint32_t *a;
+	uintptr_t *a;
 
 	o = p;
 	if (o->id != DN_API_VERSION) {
@@ -1349,8 +1348,8 @@ do_config(void *p, int l)
 			break;
 
 		case DN_CMD_DELETE:
-			/* the argument is in the first uint32 after o */
-			a = (uint32_t *)(o+1);
+			/* the argument is in the first uintptr_t after o */
+			a = (uintptr_t *)(o+1);
 			if (o->len < sizeof(*o) + sizeof(*a)) {
 				err = EINVAL;
 				break;