[src/trunk]: src/sys/dev/pci Do not try to read the EEPROM if we already know...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1e0adacea1b8
branches:  trunk
changeset: 751110:1e0adacea1b8
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Jan 24 23:27:39 2010 +0000

description:
Do not try to read the EEPROM if we already know we don't have one.

diffstat:

 sys/dev/pci/if_bge.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 3abc6b066354 -r 1e0adacea1b8 sys/dev/pci/if_bge.c
--- a/sys/dev/pci/if_bge.c      Sun Jan 24 23:09:26 2010 +0000
+++ b/sys/dev/pci/if_bge.c      Sun Jan 24 23:27:39 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bge.c,v 1.174 2010/01/24 23:09:26 martin Exp $      */
+/*     $NetBSD: if_bge.c,v 1.175 2010/01/24 23:27:39 martin Exp $      */
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.174 2010/01/24 23:09:26 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.175 2010/01/24 23:27:39 martin Exp $");
 
 #include "vlan.h"
 #include "rnd.h"
@@ -2792,7 +2792,7 @@
         */
        if (bge_readmem_ind(sc, BGE_SOFTWARE_GENCOMM_SIG) == BGE_MAGIC_NUMBER) {
                hwcfg = bge_readmem_ind(sc, BGE_SOFTWARE_GENCOMM_NICCFG);
-       } else {
+       } else if (!(sc->bge_flags & BGE_NO_EEPROM)) {
                bge_read_eeprom(sc, (void *)&hwcfg,
                    BGE_EE_HWCFG_OFFSET, sizeof(hwcfg));
                hwcfg = be32toh(hwcfg);