From owner-cvs-all@FreeBSD.ORG  Thu Mar 17 14:27:22 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 9AF7116A4CE; Thu, 17 Mar 2005 14:27:22 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 81B9743D1D; Thu, 17 Mar 2005 14:27:22 +0000 (GMT)
	(envelope-from bz@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 j2HERMg2082727;
	Thu, 17 Mar 2005 14:27:22 GMT
	(envelope-from bz@repoman.freebsd.org)
Received: (from bz@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2HERMAx082726;
	Thu, 17 Mar 2005 14:27:22 GMT
	(envelope-from bz)
Message-Id: <200503171427.j2HERMAx082726@repoman.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Thu, 17 Mar 2005 14:27:22 +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/pci if_sk.c if_skreg.h
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Mar 2005 14:27:22 -0000

bz          2005-03-17 14:27:22 UTC

  FreeBSD src repository

  Modified files:
    sys/pci              if_sk.c if_skreg.h 
  Log:
  Do not try to free non allocated memory in error case.
  Do our best to plug some memory leaks (VPD data, jumbo memory buffer,...).
  Log if we cannot free because memory still in use[1].
  Change locking to avoid ''acquiring duplicate lock of same
    type: "network driver"'' and potential deadlock. Also seems to fix LOR #063.
  
  [1] This change does not solve problems if buffers are still in use when
      unloading if_sk.ko. There is ongoing work which will address jumbogram
      allocations in a more general way.
  
  PR:             kern/75677 (with changes, no mii fixes in here)
  Tested by:      net, Antoine Brodin (slightly different version)
  Approved by:    rwatson (mentor)
  MFC after:      5 days
  
  Revision  Changes    Path
  1.102     +56 -12    src/sys/pci/if_sk.c
  1.28      +5 -1      src/sys/pci/if_skreg.h