From owner-svn-src-user@FreeBSD.ORG  Wed Feb 17 17:34:55 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 D97B710656C1;
	Wed, 17 Feb 2010 17:34:55 +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 C95B68FC12;
	Wed, 17 Feb 2010 17:34:55 +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 o1HHYtUW009770;
	Wed, 17 Feb 2010 17:34:55 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1HHYtwt009768;
	Wed, 17 Feb 2010 17:34:55 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201002171734.o1HHYtwt009768@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Wed, 17 Feb 2010 17:34:55 +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: r204011 - 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: Wed, 17 Feb 2010 17:34:55 -0000

Author: luigi
Date: Wed Feb 17 17:34:55 2010
New Revision: 204011
URL: http://svn.freebsd.org/changeset/base/204011

Log:
  diff reduction

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	Wed Feb 17 17:34:30 2010	(r204010)
+++ user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dummynet.c	Wed Feb 17 17:34:55 2010	(r204011)
@@ -1676,20 +1676,20 @@ dummynet_get(struct sockopt *sopt, void 
 	struct dn_id cmd;
 	struct copy_args a;
 
+	/* save and restore original sopt_valsize around copyin */
 	sopt_valsize = sopt->sopt_valsize;
 	if (!compat) {
 		D("standard mode");
-		/* save and restore original sopt_valsize around copyin */
 
-	error = sooptcopyin(sopt, &cmd, sizeof(cmd), sizeof(cmd));
-	sopt->sopt_valsize = sopt_valsize;
-	if (error)
-		return error;
+		error = sooptcopyin(sopt, &cmd, sizeof(cmd), sizeof(cmd));
+		sopt->sopt_valsize = sopt_valsize;
+		if (error)
+			return error;
 	} else {
 		cmd.type = DN_CMD_GET;
 		cmd.len = sizeof(struct dn_id);
 		cmd.subtype = DN_GET_COMPAT;
-// 		cmd.id = sopt_valsize;
+		// cmd.id = sopt_valsize;
 		D("compatibility mode");
 	}
 	/* Count space (under lock) and allocate (outside lock).
@@ -1721,9 +1721,8 @@ dummynet_get(struct sockopt *sopt, void 
 	if (start == NULL) {
 		if (compat) {
 			*compat = NULL;
-			return 1;
+			return 1; // XXX
 		}
-		else
 		return sooptcopyout(sopt, &cmd, sizeof(cmd));
 	}
 	ND("have %d:%d sched %d, %d:%d links %d, %d:%d flowsets %d, "