From owner-svn-src-user@FreeBSD.ORG  Thu Jan 21 10:08:59 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 148F0106566B;
	Thu, 21 Jan 2010 10:08:59 +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 048B78FC1D;
	Thu, 21 Jan 2010 10:08:59 +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 o0LA8w1R092031;
	Thu, 21 Jan 2010 10:08:58 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0LA8wxR092029;
	Thu, 21 Jan 2010 10:08:58 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201001211008.o0LA8wxR092029@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Thu, 21 Jan 2010 10:08:58 +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: r202737 - 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: Thu, 21 Jan 2010 10:08:59 -0000

Author: luigi
Date: Thu Jan 21 10:08:58 2010
New Revision: 202737
URL: http://svn.freebsd.org/changeset/base/202737

Log:
  initialize a field for si_new

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	Thu Jan 21 09:11:50 2010	(r202736)
+++ user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dummynet.c	Thu Jan 21 10:08:58 2010	(r202737)
@@ -648,6 +648,7 @@ schk_new(uintptr_t key, int flags, void 
 	s->pipe.pipe_nr = s->sch.sched_nr;
 	SLIST_INIT(&s->fsk_list);
 	/* initialize the hash table or create the single instance */
+	s->fp = a->fp;	/* si_new needs this */
 	s->siht = (s->sch.flags & DN_HAVE_MASK) ?
 		dn_ht_init(NULL, s->sch.buckets,
 			offsetof(struct new_sch_inst, si_next),
@@ -657,6 +658,7 @@ schk_new(uintptr_t key, int flags, void 
 		free(s, M_DUMMYNET);
 		return NULL;
 	}
+	s->fp = NULL;	/* mark as a new scheduler */
 	dn_cfg.schk_count++;
 	return s;
 }