From owner-svn-src-all@FreeBSD.ORG  Tue Sep 25 12:45:42 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 15E761065674;
	Tue, 25 Sep 2012 12:45:42 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 005338FC0C;
	Tue, 25 Sep 2012 12:45:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8PCjfQv031368;
	Tue, 25 Sep 2012 12:45:41 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8PCjfe8031366;
	Tue, 25 Sep 2012 12:45:41 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201209251245.q8PCjfe8031366@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 25 Sep 2012 12:45:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240918 - head/sys/contrib/altq/altq
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Sep 2012 12:45:42 -0000

Author: glebius
Date: Tue Sep 25 12:45:41 2012
New Revision: 240918
URL: http://svn.freebsd.org/changeset/base/240918

Log:
  Fix panic introduced by me in r240835, when zero weight
  was passed to wtab_alloc().
  
  Reported by:	Kim Culhan <w8hdkim gmail.com>

Modified:
  head/sys/contrib/altq/altq/altq_red.c

Modified: head/sys/contrib/altq/altq/altq_red.c
==============================================================================
--- head/sys/contrib/altq/altq/altq_red.c	Tue Sep 25 10:52:49 2012	(r240917)
+++ head/sys/contrib/altq/altq/altq_red.c	Tue Sep 25 12:45:41 2012	(r240918)
@@ -235,6 +235,11 @@ red_alloc(int weight, int inv_pmax, int 
 	if (rp == NULL)
 		return (NULL);
 
+	if (weight == 0)
+		rp->red_weight = W_WEIGHT;
+	else
+		rp->red_weight = weight;
+
 	/* allocate weight table */
 	rp->red_wtab = wtab_alloc(rp->red_weight);
 	if (rp->red_wtab == NULL) {
@@ -245,10 +250,6 @@ red_alloc(int weight, int inv_pmax, int 
 	rp->red_avg = 0;
 	rp->red_idle = 1;
 
-	if (weight == 0)
-		rp->red_weight = W_WEIGHT;
-	else
-		rp->red_weight = weight;
 	if (inv_pmax == 0)
 		rp->red_inv_pmax = default_inv_pmax;
 	else