From owner-cvs-src@FreeBSD.ORG  Tue Apr 24 10:50:25 2007
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 8B6D616A402;
	Tue, 24 Apr 2007 10:50:25 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 65E4313C4CA;
	Tue, 24 Apr 2007 10:50:25 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3OAoP7O054755;
	Tue, 24 Apr 2007 10:50:25 GMT (envelope-from mav@repoman.freebsd.org)
Received: (from mav@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3OAoPG0054754;
	Tue, 24 Apr 2007 10:50:25 GMT (envelope-from mav)
Message-Id: <200704241050.l3OAoPG0054754@repoman.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Tue, 24 Apr 2007 10:50:25 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/sys/netgraph ng_l2tp.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
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: Tue, 24 Apr 2007 10:50:25 -0000

mav         2007-04-24 10:50:25 UTC

  FreeBSD src repository

  Modified files:
    sys/netgraph         ng_l2tp.c 
  Log:
  Avoid false assertion on transmit and delayed ack timeout with enabled invariants.
  Replace callout_pending() by callout_active() to remove race window.
  
  Reviewed by:    archie
  Approved by:    glebius (mentor)
  
  Revision  Changes    Path
  1.17      +34 -23    src/sys/netgraph/ng_l2tp.c