From owner-cvs-all Mon Jan 22 15:13:54 2001 Delivered-To: cvs-all@freebsd.org Received: from wantadilla.lemis.com (wantadilla.lemis.com [192.109.197.80]) by hub.freebsd.org (Postfix) with ESMTP id 4A0B437B6BC; Mon, 22 Jan 2001 15:13:25 -0800 (PST) Received: by wantadilla.lemis.com (Postfix, from userid 1004) id 84E896A93A; Tue, 23 Jan 2001 09:43:22 +1030 (CST) Date: Tue, 23 Jan 2001 09:43:22 +1030 From: Greg Lehey To: Luigi Rizzo Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/netinet ip_dummynet.c Message-ID: <20010123094322.J3066@wantadilla.lemis.com> References: <200101222307.f0MN7ab09050@freefall.freebsd.org> <200101222304.f0MN4DM06518@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200101222304.f0MN4DM06518@freefall.freebsd.org>; from luigi@FreeBSD.org on Mon, Jan 22, 2001 at 03:04:13PM -0800 Organization: LEMIS, PO Box 460, Echunga SA 5153, Australia Phone: +61-8-8388-8286 Fax: +61-8-8388-8725 Mobile: +61-418-838-708 WWW-Home-Page: http://www.lemis.com/~grog X-PGP-Fingerprint: 6B 7B C3 8C 61 CD 54 AF 13 24 52 F8 6D A4 95 EF Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Monday, 22 January 2001 at 15:04:13 -0800, Luigi Rizzo wrote: > luigi 2001/01/22 15:04:13 PST > > Modified files: > sys/netinet ip_dummynet.c > Log: > Change critical section protection for dummynet from splnet() to > splimp() -- we need it because dummynet can be invoked by the > bridging code at splimp(). > > This should cure the pipe "stalls" that several people have been > reporting on -stable while using bridging+dummynet (the problem > would not affect routers using dummynet). This looks like a null change. splimp() and splnet() are both dummy functions in -CURRENT. On Monday, 22 January 2001 at 15:07:36 -0800, Luigi Rizzo wrote: > luigi 2001/01/22 15:07:36 PST > > Modified files: (Branch: RELENG_4) > sys/netinet ip_dummynet.c > Log: > MFC (bugfix): change critical section protection from splnet() to splimp() > so we do not get inconsistencies (leading to traffic stalls) > when dummynet is used with bridging. > > The error was reported by quite a few people over time. Hmm. We have an unofficial rule (hopefully soon to become official) that MFCs should be done not less than three days after the commit to -STABLE. I think that exceptions should be justified in the commit log. On the other hand, I suspect you really tested this under -STABLE, and the corresponding fix doesn't mean anything in -CURRENT, so I suppose that's a justification. Greg -- Finger grog@lemis.com for PGP public key See complete headers for address and phone numbers To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message