From owner-cvs-all@FreeBSD.ORG Wed May 28 15:34:44 2008 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3E40F1065675; Wed, 28 May 2008 15:34:44 +0000 (UTC) (envelope-from gavin@FreeBSD.org) Received: from mail-gw1.york.ac.uk (mail-gw1.york.ac.uk [144.32.128.246]) by mx1.freebsd.org (Postfix) with ESMTP id C37138FC16; Wed, 28 May 2008 15:34:43 +0000 (UTC) (envelope-from gavin@FreeBSD.org) Received: from mail-gw6.york.ac.uk (mail-gw6.york.ac.uk [144.32.129.26]) by mail-gw1.york.ac.uk (8.13.6/8.13.6) with ESMTP id m4SFYafr024279; Wed, 28 May 2008 16:34:36 +0100 (BST) Received: from buffy-128.york.ac.uk ([144.32.128.160] helo=buffy.york.ac.uk) by mail-gw6.york.ac.uk with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1K1Nfg-0004LT-Kt; Wed, 28 May 2008 16:34:36 +0100 Received: from buffy.york.ac.uk (localhost [127.0.0.1]) by buffy.york.ac.uk (8.14.2/8.14.2) with ESMTP id m4SFYaeu000621; Wed, 28 May 2008 16:34:36 +0100 (BST) (envelope-from gavin@FreeBSD.org) Received: (from ga9@localhost) by buffy.york.ac.uk (8.14.2/8.14.2/Submit) id m4SFYaYd000620; Wed, 28 May 2008 16:34:36 +0100 (BST) (envelope-from gavin@FreeBSD.org) X-Authentication-Warning: buffy.york.ac.uk: ga9 set sender to gavin@FreeBSD.org using -f From: Gavin Atkinson To: Antoine Brodin In-Reply-To: References: <200805271833.m4RIXI2Y021272@repoman.freebsd.org> <1211975749.93683.21.camel@buffy.york.ac.uk> <483D747C.6040008@FreeBSD.org> Content-Type: text/plain Content-Transfer-Encoding: 7bit Date: Wed, 28 May 2008 16:34:34 +0100 Message-Id: <1211988875.93683.44.camel@buffy.york.ac.uk> Mime-Version: 1.0 X-Mailer: Evolution 2.10.1 FreeBSD GNOME Team Port X-York-MailScanner: Found to be clean X-York-MailScanner-From: gavin@freebsd.org Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, "Bruce M. Simpson" , cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/net if_media.h X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 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: Wed, 28 May 2008 15:34:44 -0000 On Wed, 2008-05-28 at 17:16 +0200, Antoine Brodin wrote: > On Wed, May 28, 2008 at 5:04 PM, Bruce M. Simpson wrote: > > Gavin Atkinson wrote: > >> > >> On Tue, 2008-05-27 at 18:33 +0000, Antoine Brodin wrote: > >>> > >>> MFC to RELENG_6: > >>> Move "1000baseT" from IFM_SUBTYPE_ETHERNET_DESCRIPTIONS to > >>> IFM_SUBTYPE_ETHERNET_ALIASES: there is already "1000baseTX" in > >>> IFM_SUBTYPE_ETHERNET_DESCRIPTIONS. This doesn't change ifconfig > >>> behaviour. > >>> > >> > >> I'm not sure if this is any more correct than it was before. 1000baseT > >> and 1000baseTX are incompatible standards. > >> > >> See http://docs.FreeBSD.org/cgi/mid.cgi?20050307191901.H32508 for an > >> example of where this has come up before. The real bug is probably that > >> we claim to support 1000baseTX at all. > >> > > > > That sounds pretty clear to me. Perhaps this change should be backed out and > > done the other way around (make 1000baseTX the alias) ? > > The goal of this commit was to have only one description instead of > two (only the first one is printed by ifconfig and dmesg). So the > commit didn't change the existing behaviour of ifconfig/dmesg. > I can swap the two lines (make 1000baseT the description and > 1000baseTX the alias), but it may break existing scripts that grep > dmesg or ifconfig output for 1000baseTX. The bug seems to have originally been introduced in if_media.h 1.15, with the commit message indicating that this was following NetBSD's lead. However, the commit only touched the #define name, and not the textual representation of it. NetBSD seems to have always referred to it (more) correctly as 1000baseT. I agree that the change may have some impact on scripts that are grepping output for 1000baseTX, and so any such change could not be MFC'd, however it would probably be nice to correct this at some point in -HEAD, rather than forever leaving it incorrect. I'd be happy to work on a patch if this move is felt appropriate. Gavin