From owner-cvs-src@FreeBSD.ORG  Tue Apr  8 19:21:55 2003
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 0287337B401; Tue,  8 Apr 2003 19:21:55 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 949AC43F93; Tue,  8 Apr 2003 19:21:54 -0700 (PDT)
	(envelope-from silby@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h392Ls0U024221;
	Tue, 8 Apr 2003 19:21:54 -0700 (PDT)
	(envelope-from silby@repoman.freebsd.org)
Received: (from silby@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h392LsxA024220;
	Tue, 8 Apr 2003 19:21:54 -0700 (PDT)
Message-Id: <200304090221.h392LsxA024220@repoman.freebsd.org>
From: Mike Silbersack <silby@FreeBSD.org>
Date: Tue, 8 Apr 2003 19:21:54 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/pci if_vr.c
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: Wed, 09 Apr 2003 02:21:55 -0000

silby       2003/04/08 19:21:54 PDT

  FreeBSD src repository

  Modified files:
    sys/pci              if_vr.c 
  Log:
  Fix if_vr's handling of vr_encap failures.  3 parts:
  
  - Don't bother setting OACTIVE when the descriptors are all full
    or there's a vr_encap failure, it doesn't help anything.
  - Correctly roll back on the descriptor list after a failure
    so as not to corrupt the list.
  - Add a missing VR_UNLOCK().
  
  Without these changes, vr_encap failure (which is assured during
  a low mbuf situation) would result in the card locking until
  the watchdog could fire.
  
  MFC after:      1 week
  
  Revision  Changes    Path
  1.67      +9 -10     src/sys/pci/if_vr.c