Module Name: src
Committed By: tsutsui
Date: Sat Mar 28 22:16:08 UTC 2009
Modified Files:
src/sys/dev/ic: rtl8169.c
Log Message:
Fix another botch in hwcsum changes for PR kern/40955:
8168/8111/8168B/8111B doesn't have DESCV2.
Problem reported by Arto Huusko on current-us...@.
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/dev/ic/rtl8169.c
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.112 src/sys/dev/ic/rtl8169.c:1.113
--- src/sys/dev/ic/rtl8169.c:1.112 Fri Mar 27 12:19:17 2009
+++ src/sys/dev/ic/rtl8169.c Sat Mar 28 22:16:08 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl8169.c,v 1.112 2009/03/27 12:19:17 tsutsui Exp $ */
+/* $NetBSD: rtl8169.c,v 1.113 2009/03/28 22:16:08 tsutsui Exp $ */
/*
* Copyright (c) 1997, 1998-2003
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.112 2009/03/27 12:19:17 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.113 2009/03/28 22:16:08 tsutsui Exp $");
/* $FreeBSD: /repoman/r/ncvs/src/sys/dev/re/if_re.c,v 1.20 2004/04/11 20:34:08 ru Exp $ */
/*
@@ -593,7 +593,17 @@
break;
case RTK_HWREV_8168_SPIN1:
sc->sc_rev = 21;
- sc->sc_quirk |= RTKQ_DESCV2;
+ break;
+ case RTK_HWREV_8168_SPIN2:
+ sc->sc_rev = 22;
+ break;
+ case RTK_HWREV_8168_SPIN3:
+ sc->sc_rev = 23;
+ break;
+ case RTK_HWREV_8168C:
+ case RTK_HWREV_8168C_SPIN2:
+ sc->sc_rev = 24;
+ sc->sc_quirk |= RTKQ_DESCV2 | RTKQ_NOEECMD;
/*
* From FreeBSD driver:
*
@@ -609,22 +619,6 @@
*/
sc->sc_quirk |= RTKQ_NOJUMBO;
break;
- case RTK_HWREV_8168_SPIN2:
- sc->sc_rev = 22;
- sc->sc_quirk |= RTKQ_DESCV2;
- sc->sc_quirk |= RTKQ_NOJUMBO; /* see above */
- break;
- case RTK_HWREV_8168_SPIN3:
- sc->sc_rev = 23;
- sc->sc_quirk |= RTKQ_DESCV2;
- sc->sc_quirk |= RTKQ_NOJUMBO; /* see above */
- break;
- case RTK_HWREV_8168C:
- case RTK_HWREV_8168C_SPIN2:
- sc->sc_rev = 24;
- 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;
