svn commit: r240918 - head/sys/contrib/altq/altq

[Gleb Smirnoff]

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