From 3f563da1bf5bc57d43cb72d4fcdf2064f413abfe Mon Sep 17 00:00:00 2001 From: martin Date: Sun, 24 Jan 2010 23:27:39 +0000 Subject: Do not try to read the EEPROM if we already know we don't have one. --- sys/dev/pci/if_bge.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/dev') 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 -__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); -- cgit