Module Name: src
Committed By: matt
Date: Fri Apr 20 13:51:48 UTC 2012
Modified Files:
src/sys/arch/powerpc/booke/dev: pq3etsec.c
Log Message:
Don't use the current value of maccfg2.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/powerpc/booke/dev/pq3etsec.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/arch/powerpc/booke/dev/pq3etsec.c
diff -u src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.11 src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.12
--- src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.11 Thu Apr 19 21:32:01 2012
+++ src/sys/arch/powerpc/booke/dev/pq3etsec.c Fri Apr 20 13:51:48 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pq3etsec.c,v 1.11 2012/04/19 21:32:01 matt Exp $ */
+/* $NetBSD: pq3etsec.c,v 1.12 2012/04/20 13:51:48 matt Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.11 2012/04/19 21:32:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.12 2012/04/20 13:51:48 matt Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -501,6 +501,8 @@ pq3etsec_attach(device_t parent, device_
sc->sc_macstnaddr2 = etsec_read(sc, MACSTNADDR2);
sc->sc_macstnaddr1 = etsec_read(sc, MACSTNADDR1);
sc->sc_rctrl = RCTRL_DEFAULT;
+ sc->sc_ecntrl = etsec_read(sc, ECNTRL);
+ sc->sc_maccfg1 = etsec_read(sc, MACCFG1);
sc->sc_maccfg2 = MACCFG2_DEFAULT;
if (sc->sc_macstnaddr1 == 0 && sc->sc_macstnaddr2 == 0) {
@@ -592,9 +594,6 @@ pq3etsec_attach(device_t parent, device_
etsec_write(sc, ATTR, ATTR_DEFAULT);
etsec_write(sc, ATTRELI, ATTRELI_DEFAULT);
- sc->sc_maccfg1 = etsec_read(sc, MACCFG1);
- sc->sc_maccfg2 = etsec_read(sc, MACCFG2);
- sc->sc_ecntrl = etsec_read(sc, ECNTRL);
sc->sc_lock = mutex_obj_alloc(MUTEX_DEFAULT, IPL_SOFTNET);
