From owner-p4-projects@FreeBSD.ORG  Wed Nov 12 15:09:44 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 47F7316A4D0; Wed, 12 Nov 2003 15:09:44 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1F9B016A4CE
	for <perforce@freebsd.org>; Wed, 12 Nov 2003 15:09:44 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8CE4F43FBD
	for <perforce@freebsd.org>; Wed, 12 Nov 2003 15:09:43 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hACN9ZXJ029922
	for <perforce@freebsd.org>; Wed, 12 Nov 2003 15:09:35 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hACN90cb029908
	for perforce@freebsd.org; Wed, 12 Nov 2003 15:09:00 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Date: Wed, 12 Nov 2003 15:09:00 -0800 (PST)
Message-Id: <200311122309.hACN90cb029908@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 42184 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Nov 2003 23:09:44 -0000

http://perforce.freebsd.org/chv.cgi?CH=42184

Change 42184 by jhb@jhb_blue on 2003/11/12 15:07:05

	IFC @42183.

Affected files ...

.. //depot/projects/smpng/sys/pci/if_sk.c#24 integrate
.. //depot/projects/smpng/sys/pci/if_skreg.h#4 integrate

Differences ...

==== //depot/projects/smpng/sys/pci/if_sk.c#24 (text+ko) ====

@@ -85,7 +85,7 @@
  */
  
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/pci/if_sk.c,v 1.67 2003/11/07 22:04:26 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/pci/if_sk.c,v 1.68 2003/11/12 23:01:15 wilko Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -137,7 +137,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD: src/sys/pci/if_sk.c,v 1.67 2003/11/07 22:04:26 peter Exp $";
+  "$FreeBSD: src/sys/pci/if_sk.c,v 1.68 2003/11/12 23:01:15 wilko Exp $";
 #endif
 
 static struct sk_type sk_devs[] = {
@@ -152,6 +152,11 @@
 		"SysKonnect Gigabit Ethernet (V2.0)"
 	},
 	{
+		VENDORID_MARVELL,
+		DEVICEID_SK_V2,
+		"Marvell Gigabit Ethernet"
+	},
+	{
 		VENDORID_3COM,
 		DEVICEID_3COM_3C940,
 		"3Com 3C940 Gigabit Ethernet"

==== //depot/projects/smpng/sys/pci/if_skreg.h#4 (text+ko) ====

@@ -31,7 +31,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/pci/if_skreg.h,v 1.17 2003/11/07 22:04:26 peter Exp $
+ * $FreeBSD: src/sys/pci/if_skreg.h,v 1.18 2003/11/12 23:01:15 wilko Exp $
  */
 
 /*
@@ -60,6 +60,11 @@
 #define VENDORID_SK		0x1148
 
 /*
+ * Marvell PCI vendor ID
+ */
+#define VENDORID_MARVELL	0x11AB
+
+/*
  * SK-NET gigabit ethernet device IDs
  */
 #define DEVICEID_SK_V1		0x4300