From owner-svn-src-user@FreeBSD.ORG  Mon Jan 18 21:00:29 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 CFF991065670;
	Mon, 18 Jan 2010 21:00:29 +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 C07FC8FC43;
	Mon, 18 Jan 2010 21:00:29 +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 o0IL0TmQ076492;
	Mon, 18 Jan 2010 21:00:29 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0IL0TBi076490;
	Mon, 18 Jan 2010 21:00:29 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201001182100.o0IL0TBi076490@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Mon, 18 Jan 2010 21:00:29 +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: r202590 - 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: Mon, 18 Jan 2010 21:00:29 -0000

Author: luigi
Date: Mon Jan 18 21:00:29 2010
New Revision: 202590
URL: http://svn.freebsd.org/changeset/base/202590

Log:
  it is correct to call dn_dequeue on an empty queue

Modified:
  user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched.h

Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched.h
==============================================================================
--- user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched.h	Mon Jan 18 20:57:50 2010	(r202589)
+++ user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched.h	Mon Jan 18 21:00:29 2010	(r202590)
@@ -131,7 +131,8 @@ static __inline struct mbuf*
 dn_dequeue(struct new_queue *q)
 {
 	struct mbuf *m = q->mq.head;
-	KASSERT(m != NULL, ("empty queue to dn_return_packet"));
+	if (m == NULL)
+		return NULL;
 	q->mq.head = m->m_nextpkt;
 	q->ni.length--;
 	q->ni.len_bytes -= m->m_pkthdr.len;