From owner-cvs-src@FreeBSD.ORG  Mon Feb 21 17:11:09 2005
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id EBEE816A4CE; Mon, 21 Feb 2005 17:11:09 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id D1C3E43D3F; Mon, 21 Feb 2005 17:11:09 +0000 (GMT)
	(envelope-from mlaier@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1LHB95r047687;
	Mon, 21 Feb 2005 17:11:09 GMT
	(envelope-from mlaier@repoman.freebsd.org)
Received: (from mlaier@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1LHB9LA047686;
	Mon, 21 Feb 2005 17:11:09 GMT
	(envelope-from mlaier)
Message-Id: <200502211711.j1LHB9LA047686@repoman.freebsd.org>
From: Max Laier <mlaier@FreeBSD.org>
Date: Mon, 21 Feb 2005 17:11:09 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/contrib/altq/altq altq_subr.c altq_var.h
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Feb 2005 17:11:10 -0000

mlaier      2005-02-21 17:11:09 UTC

  FreeBSD src repository

  Modified files:
    sys/contrib/altq/altq altq_subr.c altq_var.h 
  Log:
  Don't use the static CALLOUT_INITIALIZER for __FreeBSD_version >= 600000. It
  was a bad idea, but since it is done like this in the vendor source we keep
  it around for older versions. As a safe guard against future misuse we don't
  even define CALLOUT_INITIALIZER anymore.
  
  This fixes ALTQ after callout_init_mtx() and takes altq_var.h off the vendor
  branch.
  
  Submitted by:   Divacky Roman <xdivac02NOstud.fit.vutbrSPAMcz> (w/ changes)
  
  Revision  Changes    Path
  1.6       +7 -0      src/sys/contrib/altq/altq/altq_subr.c
  1.2       +2 -1      src/sys/contrib/altq/altq/altq_var.h