Module Name: src
Committed By: snj
Date: Fri May 1 02:08:30 UTC 2009
Modified Files:
src/sys/dev/ic [netbsd-5]: rtl8169.c rtl81x9var.h
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #597):
sys/dev/ic/rtl8169.c: revision 1.111
sys/dev/ic/rtl81x9var.h: revision 1.45
Add another quirk flag which shows availability of EEPROM command register.
Now we can remove sc_rev which was intended to represent "MAC revision"
used in the Realtek driver.
To generate a diff of this commit:
cvs rdiff -u -r1.105.4.4 -r1.105.4.5 src/sys/dev/ic/rtl8169.c
cvs rdiff -u -r1.41.12.3 -r1.41.12.4 src/sys/dev/ic/rtl81x9var.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.105.4.4 src/sys/dev/ic/rtl8169.c:1.105.4.5
--- src/sys/dev/ic/rtl8169.c:1.105.4.4 Fri May 1 02:07:04 2009
+++ src/sys/dev/ic/rtl8169.c Fri May 1 02:08:29 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl8169.c,v 1.105.4.4 2009/05/01 02:07:04 snj Exp $ */
+/* $NetBSD: rtl8169.c,v 1.105.4.5 2009/05/01 02:08:29 snj Exp $ */
/*
* Copyright (c) 1997, 1998-2003
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.105.4.4 2009/05/01 02:07:04 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.105.4.5 2009/05/01 02:08:29 snj Exp $");
/* $FreeBSD: /repoman/r/ncvs/src/sys/dev/re/if_re.c,v 1.20 2004/04/11 20:34:08 ru Exp $ */
/*
@@ -622,13 +622,14 @@
case RTK_HWREV_8168C:
case RTK_HWREV_8168C_SPIN2:
sc->sc_rev = 24;
- sc->sc_quirk |= RTKQ_DESCV2;
+ sc->sc_quirk |= RTKQ_DESCV2 | RTKQ_NOEECMD;
sc->sc_quirk |= RTKQ_NOJUMBO; /* see above */
break;
case RTK_HWREV_8102E:
case RTK_HWREV_8102EL:
sc->sc_rev = 25;
- sc->sc_quirk |= RTKQ_DESCV2 | RTKQ_NOJUMBO;
+ sc->sc_quirk |=
+ RTKQ_DESCV2 | RTKQ_NOEECMD | RTKQ_NOJUMBO;
break;
case RTK_HWREV_8100E:
case RTK_HWREV_8100E_SPIN2:
@@ -656,7 +657,7 @@
/* Reset the adapter. */
re_reset(sc);
- if (sc->sc_rev == 24 || sc->sc_rev == 25) {
+ if ((sc->sc_quirk & RTKQ_NOEECMD) != 0) {
/*
* Get station address from ID registers.
*/
Index: src/sys/dev/ic/rtl81x9var.h
diff -u src/sys/dev/ic/rtl81x9var.h:1.41.12.3 src/sys/dev/ic/rtl81x9var.h:1.41.12.4
--- src/sys/dev/ic/rtl81x9var.h:1.41.12.3 Fri May 1 02:07:04 2009
+++ src/sys/dev/ic/rtl81x9var.h Fri May 1 02:08:29 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl81x9var.h,v 1.41.12.3 2009/05/01 02:07:04 snj Exp $ */
+/* $NetBSD: rtl81x9var.h,v 1.41.12.4 2009/05/01 02:08:29 snj Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -191,6 +191,7 @@
#define RTKQ_MACLDPS 0x00000010 /* has LDPS register */
#define RTKQ_DESCV2 0x00000020 /* has V2 TX/RX descriptor */
#define RTKQ_NOJUMBO 0x00000040 /* no jumbo MTU support */
+#define RTKQ_NOEECMD 0x00000080 /* unusable EEPROM command */
bus_dma_tag_t sc_dmat;
