From owner-cvs-src@FreeBSD.ORG Fri Aug 19 02:43:08 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 7E4DD16A41F; Fri, 19 Aug 2005 02:43:08 +0000 (GMT) (envelope-from thompsa@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B30143D46; Fri, 19 Aug 2005 02:43:08 +0000 (GMT) (envelope-from thompsa@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 j7J2h8IM092179; Fri, 19 Aug 2005 02:43:08 GMT (envelope-from thompsa@repoman.freebsd.org) Received: (from thompsa@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7J2h8q9092178; Fri, 19 Aug 2005 02:43:08 GMT (envelope-from thompsa) Message-Id: <200508190243.j7J2h8q9092178@repoman.freebsd.org> From: Andrew Thompson Date: Fri, 19 Aug 2005 02:43:07 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_6 Cc: Subject: cvs commit: src/sys/net bridgestp.c if_bridge.c 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: Fri, 19 Aug 2005 02:43:08 -0000 thompsa 2005-08-19 02:43:07 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) sys/net bridgestp.c if_bridge.c Log: MFC: if_bridge.c, r1.17; bridgestp.c, r1.5 > Ensure that we are holding the lock when initialising the bridge interface. We > could initialise while unlocked if the bridge is not up when setting the inet > address, ether_ioctl() would call bridge_init. > > Change it so bridge_init is always called unlocked and then locks before > calling bstp_initialization(). Approved by: re (kensmith), mlaier (mentor) Revision Changes Path 1.3.2.1 +2 -0 src/sys/net/bridgestp.c 1.11.2.5 +5 -0 src/sys/net/if_bridge.c