diff options
author | Ryan Thomas McBride <mcbride@cvs.openbsd.org> | 2007-01-21 01:08:04 +0000 |
---|---|---|
committer | Ryan Thomas McBride <mcbride@cvs.openbsd.org> | 2007-01-21 01:08:04 +0000 |
commit | d0f4154372747b0c0e6e1dc98a7ddbb5a7fae157 (patch) | |
tree | cb590c284f69e6963321b6e6b0e0eaa11a60b55e | |
parent | 573890e1b4ad7a80c4f9484950e05b1965bae216 (diff) |
Remove bogus check for old firmware.
Identical fixes from myself and brad@, also reported by chefren@pi.net.
-rw-r--r-- | sys/dev/pci/if_bnx.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/dev/pci/if_bnx.c b/sys/dev/pci/if_bnx.c index 1ebfb24cd3a..f9dfe5016f5 100644 --- a/sys/dev/pci/if_bnx.c +++ b/sys/dev/pci/if_bnx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bnx.c,v 1.40 2007/01/20 00:36:07 dlg Exp $ */ +/* $OpenBSD: if_bnx.c,v 1.41 2007/01/21 01:08:03 mcbride Exp $ */ /*- * Copyright (c) 2006 Broadcom Corporation @@ -450,7 +450,6 @@ bnx_read_firmware(struct bnx_softc *sc) return error; if (size < sizeof (struct bnx_firmware_header)) { -fail: free(p, M_DEVBUF); return EINVAL; } @@ -462,11 +461,6 @@ fail: bnx_COM_b06FwReleaseFix = ntohl(hdr->bnx_COM_b06FwReleaseFix); bnx_COM_b06FwStartAddr = ntohl(hdr->bnx_COM_b06FwStartAddr); bnx_COM_b06FwTextAddr = ntohl(hdr->bnx_COM_b06FwTextAddr); - if (bnx_COM_b06FwTextAddr > size) { - printf("%s: probably trying to use old firmware\n", - sc->bnx_dev.dv_xname); - goto fail; - } bnx_COM_b06FwTextLen = ntohl(hdr->bnx_COM_b06FwTextLen); bnx_COM_b06FwDataAddr = ntohl(hdr->bnx_COM_b06FwDataAddr); bnx_COM_b06FwDataLen = ntohl(hdr->bnx_COM_b06FwDataLen); |