From owner-cvs-all@FreeBSD.ORG Mon Mar 28 16:21:17 2005 Return-Path: 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 297F016A4CE; Mon, 28 Mar 2005 16:21:17 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E43FC43D5D; Mon, 28 Mar 2005 16:21:16 +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 j2SGLGbf050362; Mon, 28 Mar 2005 16:21:16 GMT (envelope-from bz@repoman.freebsd.org) Received: (from bz@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2SGLGru050361; Mon, 28 Mar 2005 16:21:16 GMT (envelope-from bz) Message-Id: <200503281621.j2SGLGru050361@repoman.freebsd.org> From: "Bjoern A. Zeeb" Date: Mon, 28 Mar 2005 16:21:16 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_5 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Mar 2005 16:21:17 -0000 bz 2005-03-28 16:21:16 UTC FreeBSD src repository Modified files: (Branch: RELENG_5) sys/pci if_sk.c if_skreg.h Log: MFC if_sk.c rev. 1.99: * When adding/deleting multicast addresses, only whack the address filter if the interface is marked RUNNING. Obtained from: NetBSD if_sk.c rev. 1.12 * Don't initialize the card (and start an autonegotiation) every time the IP address changes. Makes 'dhclient sk0' invocations way faster and more consistant. i.e. one DHCPREQUEST elicits the DHCPACK. Obtained from: OpenBSD if_sk.c rev. 1.56 * Additional locking changes in sk_ioctl. MFC if_sk.c rev. 1.100, if_skreg.h rev. 1.26 * Improve chip identification. Obtained from: NetBSD if_sk.c rev. 1.11 * Take PHY out of reset for Yukon Lite Rev. A3. Submitted by: postings on net@ in thread "skc0: no PHY found", 2005-02-22 MFC if_sk.c rec. 1.102, if_skreg.h rev. 1.28 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. Change locking to avoid ''acquiring duplicate lock of same type: "network driver"'' and potential deadlock. Also seems to fix LOR #063. PR: kern/75677 Approved by: re (scottl) Approved by: rwatson (mentor) Revision Changes Path 1.83.2.9 +197 -41 src/sys/pci/if_sk.c 1.20.2.5 +18 -4 src/sys/pci/if_skreg.h