From sethk@magnesium.net  Wed Nov 27 02:10:17 2002
Return-Path: <sethk@magnesium.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8E62537B406
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 27 Nov 2002 02:10:16 -0800 (PST)
Received: from magnesium.net (toxic.magnesium.net [207.154.84.15])
	by mx1.FreeBSD.org (Postfix) with SMTP id 306CB43EA9
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 27 Nov 2002 02:10:16 -0800 (PST)
	(envelope-from sethk@magnesium.net)
Received: (qmail 27902 invoked by uid 1165); 27 Nov 2002 10:10:10 -0000
Message-Id: <20021127101010.27901.qmail@magnesium.net>
Date: 27 Nov 2002 02:10:10 -0800
From: Seth Kingsley <sethk@meowfishies.com>
Reply-To: Seth Kingsley <sethk@meowfishies.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Invalid media subtype aliases in if_media.h
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         45793
>Category:       kern
>Synopsis:       [headers] [patch] invalid media subtype aliases in if_media.h
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    antoine
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 27 02:20:01 PST 2002
>Closed-Date:    Tue May 27 18:42:25 UTC 2008
>Last-Modified:  Tue May 27 18:42:25 UTC 2008
>Originator:     Seth Kingsley
>Release:        FreeBSD 4.7-RELEASE
>Organization:
>Environment:
FreeBSD 4.7-RELEASE #0: Wed Oct  9 15:08:34 GMT 2002
root@builder.freebsdmall.com:/usr/obj/usr/src/sys/GENERIC

>Description:
	Some of the media subtype aliases in net/if_media.h appear to be
	missing or duplicated, possibly as the result of a paste-o.
	
>How-To-Repeat:
	Write a program to extract the media subtype from a gigabit
	interface, then attempt to print its abbreviated subtype
	description.

>Fix:

--- /usr/src/sys/net/if_media.h.orig	Thu Nov 28 09:52:36 2002
+++ /usr/src/sys/net/if_media.h	Thu Nov 28 09:52:49 2002
@@ -296,10 +296,10 @@
 	{ IFM_1000_FX,	"1000FX" },					\
 	{ IFM_10_STP,	"10STP" },					\
 	{ IFM_10_FL,	"10FL" },					\
-	{ IFM_1000_FX,	"1000SX" },					\
-	{ IFM_1000_FX,	"1000LX" },					\
-	{ IFM_1000_FX,	"1000CX" },					\
-	{ IFM_1000_FX,	"1000TX" },					\
+	{ IFM_1000_SX,	"1000SX" },					\
+	{ IFM_1000_LX,	"1000LX" },					\
+	{ IFM_1000_CX,	"1000CX" },					\
+	{ IFM_1000_TX,	"1000TX" },					\
 	{ 0, NULL },							\
 }

>Release-Note:
>Audit-Trail:
Adding to audit trail by linimon 10/25/2005:

In 5.4, the first 3 lines of this seem to have been applied, but the
last line is currently

  IFM_100_T, "1000T"

which I can't tell is correct or not.
Responsible-Changed-From-To: freebsd-bugs->antoine 
Responsible-Changed-By: antoine 
Responsible-Changed-When: Mon Mar 17 20:08:47 UTC 2008 
Responsible-Changed-Why:  
Take. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=45793 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/45793: commit references a PR
Date: Sun, 20 Apr 2008 16:17:55 +0000 (UTC)

 antoine     2008-04-20 16:17:45 UTC
 
   FreeBSD src repository
 
   Modified files:
     sys/net              if_media.h 
   Log:
   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.
   
   PR:             45793 (maybe)
   Approved by:    rwatson (mentor)
   MFC after:      1 month
   
   Revision  Changes    Path
   1.42      +1 -1      src/sys/net/if_media.h
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->patched 
State-Changed-By: antoine 
State-Changed-When: Sun Apr 20 16:20:43 UTC 2008 
State-Changed-Why:  
Patched in HEAD. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=45793 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/45793: commit references a PR
Date: Tue, 27 May 2008 18:33:24 +0000 (UTC)

 antoine     2008-05-27 18:33:18 UTC
 
   FreeBSD src repository
 
   Modified files:        (Branch: RELENG_6)
     sys/net              if_media.h 
   Log:
   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.
   
     PR:             45793 (maybe)
     Approved by:    rwatson (mentor)
     MFC after:      1 month
   
   Revision  Changes    Path
   1.30.2.6  +1 -1      src/sys/net/if_media.h
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/45793: commit references a PR
Date: Tue, 27 May 2008 18:34:29 +0000 (UTC)

 antoine     2008-05-27 18:34:20 UTC
 
   FreeBSD src repository
 
   Modified files:        (Branch: RELENG_7)
     sys/net              if_media.h 
   Log:
   MFC to RELENG_7:
     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.
   
     PR:             45793 (maybe)
     Approved by:    rwatson (mentor)
     MFC after:      1 month
   
   Revision  Changes    Path
   1.40.2.2  +1 -1      src/sys/net/if_media.h
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: antoine 
State-Changed-When: Tue May 27 18:41:43 UTC 2008 
State-Changed-Why:  
Everything in the patch has been applied, thanks for the report! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=45793 
>Unformatted:
