From owner-svn-src-user@FreeBSD.ORG  Mon Feb  1 14:29:07 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 97778106566B;
	Mon,  1 Feb 2010 14:29:07 +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 85CCE8FC12;
	Mon,  1 Feb 2010 14:29:07 +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 o11ET7Fk078832;
	Mon, 1 Feb 2010 14:29:07 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o11ET7tc078830;
	Mon, 1 Feb 2010 14:29:07 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201002011429.o11ET7tc078830@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Mon, 1 Feb 2010 14:29:07 +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: r203345 - 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, 01 Feb 2010 14:29:07 -0000

Author: luigi
Date: Mon Feb  1 14:29:07 2010
New Revision: 203345
URL: http://svn.freebsd.org/changeset/base/203345

Log:
  fix removal of a queue from the round robin list

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

Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_rr.c
==============================================================================
--- user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_rr.c	Mon Feb  1 14:17:40 2010	(r203344)
+++ user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_rr.c	Mon Feb  1 14:29:07 2010	(r203345)
@@ -113,15 +113,14 @@ remove_queue_q(struct rr_queue *q, struc
 	if (q == si->head)
 		return rr_remove_head(si);
 
-	prev = si->head;
-	while (prev) {
-		if (prev->qnext == q) {
-			prev->qnext = q->qnext;
-			if (q == si->tail)
-				si->tail = prev;
-			q->status = 0;
-		}
-		prev = prev->qnext;
+	for (prev = si->head; prev; prev = prev->qnext) {
+		if (prev->qnext != q)
+			continue;
+		prev->qnext = q->qnext;
+		if (q == si->tail)
+			si->tail = prev;
+		q->status = 0;
+		break;
 	}
 }