From osa@freebsd.org.ru  Wed Feb 26 01:35:13 2003
Return-Path: <osa@freebsd.org.ru>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 9E4C537B401; Wed, 26 Feb 2003 01:35:13 -0800 (PST)
Received: from freebsd.org.ru (freebsd.org.ru [194.84.67.5])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id DEF8443F93; Wed, 26 Feb 2003 01:35:12 -0800 (PST)
	(envelope-from osa@freebsd.org.ru)
Received: by freebsd.org.ru (Postfix, from userid 1000)
	id BA96E1F; Wed, 26 Feb 2003 12:35:09 +0300 (MSK)
Message-Id: <20030226093509.BA96E1F@freebsd.org.ru>
Date: Wed, 26 Feb 2003 12:35:09 +0300 (MSK)
From: Sergey A.Osokin <osa@FreeBSD.org.ru>
Reply-To: Sergey A.Osokin <osa@FreeBSD.org.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc: jlemon@FreeBSD.org
Subject: [PATCH] correct names for fxp-devices
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         48699
>Category:       kern
>Synopsis:       [PATCH] correct names for fxp-devices
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jdp
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Feb 26 01:40:04 PST 2003
>Closed-Date:    Sat Apr 05 11:04:40 PST 2003
>Last-Modified:  Sat Apr 05 11:04:40 PST 2003
>Originator:     Sergey A. Osokin
>Release:        FreeBSD 5.0-CURRENT
>Organization:
n/a
>Environment:
System: FreeBSD 5.0-CURRENT i386


>Description:
	Correct names for fxp-devices
	Sort data by devid in fxp_ident_table[]
	Information obtained from NetBSD src/sys/dev/pci/pcidevs.h
>How-To-Repeat:
	
>Fix:

Index: src/sys/dev/fxp/if_fxp.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/fxp/if_fxp.c,v
retrieving revision 1.145
diff -u -r1.145 if_fxp.c
--- src/sys/dev/fxp/if_fxp.c	2003/01/21 08:55:32	1.145
+++ src/sys/dev/fxp/if_fxp.c	2003/02/26 09:29:37
@@ -146,25 +146,25 @@
  * them.
  */
 static struct fxp_ident fxp_ident_table[] = {
+    { 0x1029,		"Intel Pro/100 Ethernet" },
+    { 0x1030,		"Intel Pro/100 InBusiness Fast Ethernet" },
+    { 0x1031,		"Intel Pro/100 VE Ethernet" },
+    { 0x1032,		"Intel Pro/100 VE Ethernet" },
+    { 0x1033,		"Intel Pro/100 VM Ethernet" },
+    { 0x1034,		"Intel Pro/100 VM Ethernet" },
+    { 0x1035,		"Intel Pro/100 82562EH HomePNA Ethernet" },
+    { 0x1036,		"Intel Pro/100 82562EH HomePNA Ethernet" },
+    { 0x1037,		"Intel Pro/100 82562EH HomePNA Ethernet" },
+    { 0x1038,		"Intel Pro/100 VM Ethernet" },
+    { 0x1039,		"Intel Pro/100 VE Ethernet with 82562ET/EZ PHY" },
+    { 0x103A,		"Intel Pro/100 VE Ethernet with 82562ET/EZ (CNR) PHY" },
+    { 0x103B,		"Intel Pro/100 VM Ethernet with 82562EM/EX PHY" },
+    { 0x103C,		"Intel Pro/100 VM Ethernet with 82562EM/EX (CNR) PHY" },
+    { 0x103D,		"Intel Pro/100 VE (MOB) Ethernet" },
+    { 0x103E,		"Intel Pro/100 VM (MOB) Ethernet" },
+    { 0x1209,		"Intel Embedded 10/100 Ethernet" },
     { 0x1229,		"Intel Pro 10/100B/100+ Ethernet" },
     { 0x2449,		"Intel Pro/100 Ethernet" },
-    { 0x1209,		"Intel Embedded 10/100 Ethernet" },
-    { 0x1029,		"Intel Pro/100 Ethernet" },
-    { 0x1030,		"Intel Pro/100 Ethernet" },
-    { 0x1031,		"Intel Pro/100 Ethernet" },
-    { 0x1032,		"Intel Pro/100 Ethernet" },
-    { 0x1033,		"Intel Pro/100 Ethernet" },
-    { 0x1034,		"Intel Pro/100 Ethernet" },
-    { 0x1035,		"Intel Pro/100 Ethernet" },
-    { 0x1036,		"Intel Pro/100 Ethernet" },
-    { 0x1037,		"Intel Pro/100 Ethernet" },
-    { 0x1038,		"Intel Pro/100 Ethernet" },
-    { 0x1039,		"Intel Pro/100 Ethernet" },
-    { 0x103A,		"Intel Pro/100 Ethernet" },
-    { 0x103B,		"Intel Pro/100 Ethernet" },
-    { 0x103C,		"Intel Pro/100 Ethernet" },
-    { 0x103D,		"Intel Pro/100 Ethernet" },
-    { 0x103E,		"Intel Pro/100 Ethernet" },
     { 0,		NULL },
 };
 
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->patched 
State-Changed-By: jdp 
State-Changed-When: Sat Mar 8 13:47:17 PST 2003 
State-Changed-Why:  
Fixed in -current with if_fxp.c revision 1.151.  I will close this 
PR after I merge the fix into -stable. 


Responsible-Changed-From-To: freebsd-bugs->jdp 
Responsible-Changed-By: jdp 
Responsible-Changed-When: Sat Mar 8 13:47:17 PST 2003 
Responsible-Changed-Why:  
Sergey asked me to look after this PR. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=48699 
State-Changed-From-To: patched->closed 
State-Changed-By: jdp 
State-Changed-When: Sat Apr 5 11:03:44 PST 2003 
State-Changed-Why:  
I have merged this change into the RELENG_4 branch. 

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