From owner-cvs-src@FreeBSD.ORG Sat Jan 14 20:42:40 2006 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 B4D4716A41F; Sat, 14 Jan 2006 20:42:40 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from speedfactory.net (mail6.speedfactory.net [66.23.216.219]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4AACB43D72; Sat, 14 Jan 2006 20:42:34 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (unverified [66.23.211.162]) by speedfactory.net (SurgeMail 3.5b3) with ESMTP id 6075692 for multiple; Sat, 14 Jan 2006 15:41:05 -0500 Received: from localhost.baldwin.cx (john@localhost [127.0.0.1]) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k0EKgUI4007863; Sat, 14 Jan 2006 15:42:32 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: Doug Barton Date: Sat, 14 Jan 2006 15:43:25 -0500 User-Agent: KMail/1.8.2 References: <200601131151.k0DBpDhC039336@repoman.freebsd.org> <43C8692A.9040301@FreeBSD.org> In-Reply-To: <43C8692A.9040301@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200601141543.27356.jhb@freebsd.org> X-Virus-Scanned: ClamAV 0.87.1/1241/Sat Jan 14 05:00:03 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-0.8 required=4.2 tests=ALL_TRUSTED, SUBJ_HAS_SPACES autolearn=failed version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx X-Server: High Performance Mail Server - http://surgemail.com r=1653887525 Cc: cvs-src@freebsd.org, Gleb Smirnoff , src-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/sys/dev/bge if_bge.c src/sys/dev/em if_em.c src/sys/dev/ixgb if_ixgb.c src/sys/dev/nge if_nge.c src/sys/dev/re if_re.c src/sys/dev/txp if_txp.c src/sys/dev/vge if_vge.c src/sys/net if_vlan.c if_vlan_var.h src/sys/net80211 ... 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: Sat, 14 Jan 2006 20:42:40 -0000 On Friday 13 January 2006 09:59 pm, Doug Barton wrote: > Gleb Smirnoff wrote: > > glebius 2006-01-13 11:51:11 UTC > > > > FreeBSD src repository > > > > Modified files: (Branch: RELENG_6) > > sys/dev/bge if_bge.c > > sys/dev/em if_em.c > > sys/dev/ixgb if_ixgb.c > > sys/dev/nge if_nge.c > > sys/dev/re if_re.c > > sys/dev/txp if_txp.c > > sys/dev/vge if_vge.c > > sys/net if_vlan.c if_vlan_var.h > > sys/net80211 ieee80211_input.c > > sys/pci if_ti.c > > Log: > > MFC: > > - Use VLAN_TAG_VALUE() not only to read a dot1q tag > > value from an m_tag, but also to set it. This reduces > > complex code duplication and improves its readability. > > - Fix VLAN_INPUT_TAG() macro, so that it doesn't touch mtag in > > case if memory allocation failed. > > - Remove fourth argument from VLAN_INPUT_TAG(), that was used > > incorrectly in almost all drivers. Indicate failure with > > mbuf value of NULL. > > > > Revision Changes Path > > 1.91.2.7 +5 -2 src/sys/dev/bge/if_bge.c > > 1.65.2.11 +1 -3 src/sys/dev/em/if_em.c > > 1.10.2.5 +1 -2 src/sys/dev/ixgb/if_ixgb.c > > 1.75.2.5 +3 -1 src/sys/dev/nge/if_nge.c > > 1.46.2.11 +5 -2 src/sys/dev/re/if_re.c > > 1.31.2.4 +3 -2 src/sys/dev/txp/if_txp.c > > 1.14.2.5 +5 -2 src/sys/dev/vge/if_vge.c > > 1.79.2.7 +1 -1 src/sys/net/if_vlan.c > > 1.21.2.1 +13 -7 src/sys/net/if_vlan_var.h > > 1.62.2.6 +3 -2 src/sys/net80211/ieee80211_input.c > > 1.107.2.4 +5 -2 src/sys/pci/if_ti.c > > > > According to the tinderboxes, this breaks the build on RELENG_6. Did you > test this? I'm not sure that's quite fair. :) What happened is that his original patch did work fine (and has been in HEAD for a while), but it changed the API, so he did a quick fixup to restore the API in RELENG_6 and missed one file during that subsequent update. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org