summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2010-01-24 23:27:39 +0000
committermartin <martin@NetBSD.org>2010-01-24 23:27:39 +0000
commit3f563da1bf5bc57d43cb72d4fcdf2064f413abfe (patch)
treebc8b4aa1e07abb253eaa91ed6963c2c2cdf232b1 /sys/dev
parent808ceeabba3758df82e3f4bb7be4bde9ef764440 (diff)
Do not try to read the EEPROM if we already know we don't have one.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/if_bge.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c
index d1ab0a76f6e..3548b2be882 100644
--- a/sys/dev/pci/if_bge.c
+++ b/sys/dev/pci/if_bge.c
@@ -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 @@ got_eaddr:
*/
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);