From owner-cvs-src@FreeBSD.ORG Thu Sep 29 16:52:20 2005 Return-Path: X-Original-To: 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 4035716A41F; Thu, 29 Sep 2005 16:52:20 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 115D843D48; Thu, 29 Sep 2005 16:52:20 +0000 (GMT) (envelope-from jhb@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 j8TGqJgD040867; Thu, 29 Sep 2005 16:52:19 GMT (envelope-from jhb@repoman.freebsd.org) Received: (from jhb@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8TGqJhZ040866; Thu, 29 Sep 2005 16:52:19 GMT (envelope-from jhb) Message-Id: <200509291652.j8TGqJhZ040866@repoman.freebsd.org> From: John Baldwin Date: Thu, 29 Sep 2005 16:52:19 +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/dev/re if_re.c src/sys/pci if_rl.c if_rlreg.h X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Sep 2005 16:52:20 -0000 jhb 2005-09-29 16:52:19 UTC FreeBSD src repository Modified files: sys/dev/re if_re.c sys/pci if_rl.c if_rlreg.h Log: - Use if_printf() and device_printf() in re(4) and remove rl_unit from the softc. - Use callout_init_mtx() and rather than timeout/untimeout in both rl(4) and re(4). - Fix locking for ifmedia by locking the driver in the ifmedia handlers rather than in the miibus functions. (re(4) didn't lock the mii stuff at all!) - Fix some locking in re_ioctl(). Note: the two drivers share the same softc declared in if_rlreg.h, so they had to be change simultaneously. MFC after: 1 week Tested by: several on rl(4), none on re(4) Revision Changes Path 1.55 +49 -54 src/sys/dev/re/if_re.c 1.157 +11 -17 src/sys/pci/if_rl.c 1.53 +1 -2 src/sys/pci/if_rlreg.h