CVS commit: [netbsd-5] src/sys/dev/ic

[Soren Jacobsen]

Module Name:    src
Committed By:   snj
Date:           Fri May  1 02:11:15 UTC 2009

Modified Files:
        src/sys/dev/ic [netbsd-5]: rtl8169.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #597):
        sys/dev/ic/rtl8169.c: revision 1.113
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.105.4.6 -r1.105.4.7 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.105.4.6 src/sys/dev/ic/rtl8169.c:1.105.4.7
--- src/sys/dev/ic/rtl8169.c:1.105.4.6	Fri May  1 02:10:03 2009
+++ src/sys/dev/ic/rtl8169.c	Fri May  1 02:11:15 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtl8169.c,v 1.105.4.6 2009/05/01 02:10:03 snj Exp $	*/
+/*	$NetBSD: rtl8169.c,v 1.105.4.7 2009/05/01 02:11:15 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.6 2009/05/01 02:10:03 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.105.4.7 2009/05/01 02:11:15 snj 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;