diff options
| author | Dimitry Andric <dim@cvs.openbsd.org> | 2006-04-02 20:30:21 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@cvs.openbsd.org> | 2006-04-02 20:30:21 +0000 |
| commit | 5428968f0f8fb5057e43ff7c716316f56b5b8876 (patch) | |
| tree | eb52706b49cc175db22b5282a86c1f51f7fdaeae /sys/dev/pci/if_iwireg.h | |
| parent | a549a1d7a917c0bfae329d45a5af791f1b5b6ffc (diff) | |
Prevent panic when loading pre-3.0 iwi firmware, and give a helpful
error message instead. Also return EINVAL for some other error paths.
ok damien, deraadt
Diffstat (limited to 'sys/dev/pci/if_iwireg.h')
| -rw-r--r-- | sys/dev/pci/if_iwireg.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/pci/if_iwireg.h b/sys/dev/pci/if_iwireg.h index db1585d84f3..dd43adc399f 100644 --- a/sys/dev/pci/if_iwireg.h +++ b/sys/dev/pci/if_iwireg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwireg.h,v 1.23 2006/04/01 01:04:40 pedro Exp $ */ +/* $OpenBSD: if_iwireg.h,v 1.24 2006/04/02 20:30:20 dim Exp $ */ /*- * Copyright (c) 2004-2006 @@ -129,7 +129,10 @@ /* firmware binary image header */ struct iwi_firmware_hdr { - uint32_t version; + uint8_t oldvermaj; + uint8_t oldvermin; + uint8_t vermaj; + uint8_t vermin; uint32_t bootsz; uint32_t ucodesz; uint32_t mainsz; |