Module Name: src
Committed By: sborrill
Date: Mon Mar 5 20:31:49 UTC 2012
Modified Files:
src/sys/dev/ic [netbsd-6]: rtl8169.c rtl81x9reg.h
Log Message:
Pull up the following revisions(s) (requested by nonaka in ticket #83):
sys/dev/ic/rtl8169.c: revision 1.135
sys/dev/ic/rtl81x9reg.h: revision 1.43
Add RTL8168E/8111E-VL support.
To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.134.4.1 src/sys/dev/ic/rtl8169.c
cvs rdiff -u -r1.42 -r1.42.4.1 src/sys/dev/ic/rtl81x9reg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/rtl8169.c
diff -u src/sys/dev/ic/rtl8169.c:1.134 src/sys/dev/ic/rtl8169.c:1.134.4.1
--- src/sys/dev/ic/rtl8169.c:1.134 Tue Nov 22 18:42:56 2011
+++ src/sys/dev/ic/rtl8169.c Mon Mar 5 20:31:49 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl8169.c,v 1.134 2011/11/22 18:42:56 garbled Exp $ */
+/* $NetBSD: rtl8169.c,v 1.134.4.1 2012/03/05 20:31:49 sborrill Exp $ */
/*
* Copyright (c) 1997, 1998-2003
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.134 2011/11/22 18:42:56 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.134.4.1 2012/03/05 20:31:49 sborrill Exp $");
/* $FreeBSD: /repoman/r/ncvs/src/sys/dev/re/if_re.c,v 1.20 2004/04/11 20:34:08 ru Exp $ */
/*
@@ -606,6 +606,10 @@ re_attach(struct rtk_softc *sc)
RTKQ_MACSTAT | RTKQ_CMDSTOP | RTKQ_PHYWAKE_PM |
RTKQ_NOJUMBO;
break;
+ case RTK_HWREV_8168E_VL:
+ sc->sc_quirk |= RTKQ_DESCV2 | RTKQ_NOEECMD |
+ RTKQ_MACSTAT | RTKQ_CMDSTOP | RTKQ_NOJUMBO;
+ break;
case RTK_HWREV_8100E:
case RTK_HWREV_8100E_SPIN2:
case RTK_HWREV_8101E:
Index: src/sys/dev/ic/rtl81x9reg.h
diff -u src/sys/dev/ic/rtl81x9reg.h:1.42 src/sys/dev/ic/rtl81x9reg.h:1.42.4.1
--- src/sys/dev/ic/rtl81x9reg.h:1.42 Tue Nov 22 18:42:57 2011
+++ src/sys/dev/ic/rtl81x9reg.h Mon Mar 5 20:31:49 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl81x9reg.h,v 1.42 2011/11/22 18:42:57 garbled Exp $ */
+/* $NetBSD: rtl81x9reg.h,v 1.42.4.1 2012/03/05 20:31:49 sborrill Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -163,6 +163,7 @@
#define RTK_HWREV_8168D 0x28000000
#define RTK_HWREV_8168DP 0x28800000
#define RTK_HWREV_8168E 0x2C000000
+#define RTK_HWREV_8168E_VL 0x2C800000
#define RTK_HWREV_8168_SPIN1 0x30000000
#define RTK_HWREV_8100E 0x30800000
#define RTK_HWREV_8101E 0x34000000
