panic in altq

Max Laier max at love2party.net
Mon Feb 21 17:13:43 GMT 2005


On Monday 21 February 2005 16:47, Divacky Roman wrote:
> I was seeing panics on boot when pf was enabled.
> this patch:
>
> Index: altq_subr.c
> ===================================================================
> RCS file: /home/ncvs/src/sys/contrib/altq/altq/altq_subr.c,v
> retrieving revision 1.5
> diff -u -r1.5 altq_subr.c
> --- altq_subr.c	15 Jun 2004 23:59:37 -0000	1.5
> +++ altq_subr.c	21 Feb 2005 15:44:21 -0000
> @@ -93,7 +93,7 @@
>  int (*altq_input)(struct mbuf *, int) = NULL;
>  static struct mbuf *tbr_dequeue(struct ifaltq *, int);
>  static int tbr_timer = 0;	/* token bucket regulator timer */
> -static struct callout tbr_callout = CALLOUT_INITIALIZER;
> +static struct callout tbr_callout;
>
>  #ifdef ALTQ3_CLFIER_COMPAT
>  static int 	extract_ports4(struct mbuf *, struct ip *, struct flowinfo_in
> *); @@ -155,6 +155,7 @@
>  	void *(*classify)(void *, struct mbuf *, int);
>  {
>  	IFQ_LOCK(ifq);
> +	callout_init(&tbr_callout, 0);
>  	if (!ALTQ_IS_READY(ifq)) {
>  		IFQ_UNLOCK(ifq);
>  		return ENXIO;
>
>
> it completly solves (it used illegaly initialized callout, dunno hows
> possible it worked before)
>
> I hope for commiting this

Done with changes.  Thanks for the report.

-- 
/"\  Best regards,                      | mlaier at freebsd.org
\ /  Max Laier                          | ICQ #67774661
 X   http://pf4freebsd.love2party.net/  | mlaier at EFnet
/ \  ASCII Ribbon Campaign              | Against HTML Mail and News
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-current/attachments/20050221/b242a71b/attachment.bin


More information about the freebsd-current mailing list