5079410 Iprb: request adding device id 1050 in driver_aliases file

6251566 RFE: add driver alias for pci8086,1059
6261230 iprb: pci8086,1068 is needed in iprb driver_aliases
6330971 Request support for Intel ICH7 network controller
6397979 Iprb: Request support for device pci8086,1069

3 files changed, 16 insertions, 7 deletions

diff --git a/usr/src/pkgdefs/SUNWos86r/postinstall b/usr/src/pkgdefs/SUNWos86r/postinstall
index 42e3f8eb58..f332504df0 100644
--- a/usr/src/pkgdefs/SUNWos86r/postinstall
+++ b/usr/src/pkgdefs/SUNWos86r/postinstall
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -203,7 +203,7 @@ i386)
 		-i '"pci1000,1" "pci1000,2" "pci1000,3" "pci1000,4" "pci1000,6" "pci1000,c" "pci1000,f" "pci1000,8f" ' \
 		ncrs
 	check_add_drv -b "${BASEDIR}" \
-		-i '"pci8086,1029" "pci8086,1229" "pci8086,1229.8086.1009" "pci8086,1229.8086.100c" "pci8086,1229.8086.1012" "pci8086,1229.8086.1013" "pci8086,1229.8086.1015"	"pci8086,1229.8086.1016" "pci8086,1229.8086.1017" "pci8086,1030" "pci8086,1031" "pci8086,1032" "pci8086,1038" "pci8086,1039" "pci8086,103d" "pci8086,2449"' \
+		-i '"pci8086,1029" "pci8086,1229" "pci8086,1229.8086.1009" "pci8086,1229.8086.100c" "pci8086,1229.8086.1012" "pci8086,1229.8086.1013" "pci8086,1229.8086.1015"	"pci8086,1229.8086.1016" "pci8086,1229.8086.1017" "pci8086,1030" "pci8086,1031" "pci8086,1032" "pci8086,1038" "pci8086,1039" "pci8086,103d" "pci8086,1050" "pci8086,1059" "pci8086,1068" "pci8086,1069" "pci8086,2449" "pci8086,27dc"' \
 		iprb
 	check_add_drv -b "${BASEDIR}" \
 		-i '"pci10b8,5"' \
diff --git a/usr/src/pkgdefs/SUNWrmodr/i.master b/usr/src/pkgdefs/SUNWrmodr/i.master
index f190ae7233..25fcb3b502 100644
--- a/usr/src/pkgdefs/SUNWrmodr/i.master
+++ b/usr/src/pkgdefs/SUNWrmodr/i.master
@@ -3,9 +3,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -21,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -146,6 +145,10 @@ pci8086,1032 pci8086,1032 net pci iprb.bef "Intel Pro/100 VE Ethernet"
 pci8086,1038 pci8086,1038 net pci iprb.bef "Intel 82559 PRO/100 VM Ethernet"
 pci8086,1039 pci8086,1039 net pci iprb.bef "Intel 82801DB Ethernet 82562ET/EZ PHY"
 pci8086,103d pci8086,103d net pci iprb.bef "Intel 82801DB PRO/100 VE Ethernet"
+pci8086,1050 pci8086,1050 net pci iprb.bef "Intel 82562EZ PRO/100 VE Ethernet"
+pci8086,1059 pci8086,1059 net pci iprb.bef "Intel 82551QM PRO/100 VE Ethernet"
+pci8086,1068 pci8086,1068 net pci iprb.bef "Intel 82562ET/EZ/GT/GZ - PRO/100 VE Ethernet"
+pci8086,1069 pci8086,1069 net pci iprb.bef "Intel 82562EM/EX/GX - PRO/100 VM Ethernet"
 pci8086,1229 pci8086,1229 net pci iprb.bef "Intel Pro100/B Fast Ethernet"
 pci8086,1229.8086.1009 pci8086,1229 net pci iprb.bef "Intel Pro100/B Fast Ethernet"
 pci8086,1229.8086.100c pci8086,1229 net pci iprb.bef "Intel Pro100/B Fast Ethernet"
@@ -155,6 +158,7 @@ pci8086,1229.8086.1015 pci8086,1229 net pci iprb.bef "Intel Pro100/B Fast Ethern
 pci8086,1229.8086.1016 pci8086,1229 net pci iprb.bef "Intel Pro100/B Fast Ethernet"
 pci8086,1229.8086.1017 pci8086,1229 net pci iprb.bef "Intel Pro100/B Fast Ethernet"
 pci8086,2449 pci8086,2449 net pci iprb.bef "Intel i815/82559 Ethernet"
+pci8086,27dc pci8086,27dc net pci iprb.bef "Intel ICH7 82801G Ethernet"
 EOF
 
 		# New igige server entry
diff --git a/usr/src/uts/intel/os/master b/usr/src/uts/intel/os/master
index b0f5001f76..747daa45c9 100644
--- a/usr/src/uts/intel/os/master
+++ b/usr/src/uts/intel/os/master
@@ -19,7 +19,7 @@ version 1.0
 #
 # CDDL HEADER END
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -288,6 +288,10 @@ pci8086,1032 pci8086,1032 net pci iprb.bef "Intel Pro/100 VE Ethernet"
 pci8086,1038 pci8086,1038 net pci iprb.bef "Intel 82559 PRO/100 VM Ethernet"
 pci8086,1039 pci8086,1039 net pci iprb.bef "Intel 82801DB Ethernet 82562ET/EZ PHY"
 pci8086,103d pci8086,103d net pci iprb.bef "Intel 82801DB PRO/100 VE Ethernet"
+pci8086,1050 pci8086,1050 net pci iprb.bef "Intel 82562EZ PRO/100 VE Ethernet"
+pci8086,1059 pci8086,1059 net pci iprb.bef "Intel 82551QM PRO/100 VE Ethernet"
+pci8086,1068 pci8086,1068 net pci iprb.bef "Intel 82562ET/EZ/GT/GZ - PRO/100 VE Ethernet"
+pci8086,1069 pci8086,1069 net pci iprb.bef "Intel 82562EM/EX/GX - PRO/100 VM Ethernet"
 pci8086,1229 pci8086,1229 net pci iprb.bef "Intel Pro100/B Fast Ethernet"
 pci8086,1229.8086.1009 pci8086,1229 net pci iprb.bef "Intel Pro100/B Fast Ethernet"
 pci8086,1229.8086.100c pci8086,1229 net pci iprb.bef "Intel Pro100/B Fast Ethernet"
@@ -297,6 +301,7 @@ pci8086,1229.8086.1015 pci8086,1229 net pci iprb.bef "Intel Pro100/B Fast Ethern
 pci8086,1229.8086.1016 pci8086,1229 net pci iprb.bef "Intel Pro100/B Fast Ethernet"
 pci8086,1229.8086.1017 pci8086,1229 net pci iprb.bef "Intel Pro100/B Fast Ethernet"
 pci8086,2449 pci8086,2449 net pci iprb.bef "Intel i815/82559 Ethernet"
+pci8086,27dc pci8086,27dc net pci iprb.bef "Intel ICH7 82801G Ethernet"
 pci10b8,5 pci10b8,5 net pci spwr.bef "SMC EtherPower II 10/100 (9432)"
 pci101a,f2d scsi msd pci none "NCR PDS/PQS 53C896-based PCI SCSI Adapter" compatible="pci101a,f2d"
 pci101a,f2e scsi msd pci none "NCR PDS/PQS 53C896-based PCI SCSI Adapter" compatible="pci101a,f2e"