diff options
| author |   mglocker <mglocker@openbsd.org> | 2007-05-25 18:31:01 +0000 |
|---|---|---|
| committer | mglocker <mglocker@openbsd.org> | 2007-05-25 18:31:01 +0000 |
| commit | 7a7abf49273685baeecfacbc082b44888f38ab31 (patch) | |
| tree | 8cc640f1fe11129e9bec9729d18d8084ad79df8c | |
| parent | Check fdopen() return value. (diff) | |
| download | wireguard-openbsd-7a7abf49273685baeecfacbc082b44888f38ab31.tar.xz wireguard-openbsd-7a7abf49273685baeecfacbc082b44888f38ab31.zip | |
Bump firmware package version; Better naming of the malo firmware files.
discussed with, and OK claudio@
| -rw-r--r-- | share/man/man4/malo.4 | 14 | ||||
| -rw-r--r-- | sys/dev/ic/malo.c | 6 | ||||
| -rw-r--r-- | sys/dev/pcmcia/if_malo.c | 6 |
3 files changed, 13 insertions, 13 deletions
diff --git a/share/man/man4/malo.4 b/share/man/man4/malo.4 index 77bf98523bd..dcabf94924f 100644 --- a/share/man/man4/malo.4 +++ b/share/man/man4/malo.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: malo.4,v 1.20 2007/05/25 13:19:28 mglocker Exp $ +.\" $OpenBSD: malo.4,v 1.21 2007/05/25 18:31:01 mglocker Exp $ .\" .\" Copyright (c) 2006 Theo de Raadt. .\" @@ -218,11 +218,11 @@ The driver needs a set of firmware files which are loaded when an interface is brought up: .Pp .Bl -tag -width Ds -offset indent -compact -.It Pa /etc/firmware/mrv8338.fw -.It Pa /etc/firmware/mrv8385-h.fw -.It Pa /etc/firmware/mrv8385-m.fw -.It Pa /etc/firmware/mrv8k-b.fw -.It Pa /etc/firmware/mrv8k-f.fw +.It Pa /etc/firmware/malo8335-h +.It Pa /etc/firmware/malo8335-m +.It Pa /etc/firmware/malo8338 +.It Pa /etc/firmware/malo8385-h +.It Pa /etc/firmware/malo8385-m .El .Pp These firmware files are not free because Marvell refuses @@ -236,7 +236,7 @@ A prepackaged version of the firmware, designed to be used with .Xr pkg_add 1 , can be found at: .Bd -literal -offset indent -http://www.nazgul.ch/malo/malo-firmware-1.2.tgz +http://www.nazgul.ch/malo/malo-firmware-1.3.tgz .Ed .Sh HARDWARE The following cards are among those supported by the diff --git a/sys/dev/ic/malo.c b/sys/dev/ic/malo.c index f36d901889c..26ecbc40dd4 100644 --- a/sys/dev/ic/malo.c +++ b/sys/dev/ic/malo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: malo.c,v 1.69 2007/05/09 19:34:07 mglocker Exp $ */ +/* $OpenBSD: malo.c,v 1.70 2007/05/25 18:31:02 mglocker Exp $ */ /* * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org> @@ -1801,7 +1801,7 @@ skip: int malo_load_bootimg(struct malo_softc *sc) { - char *name = "mrv8k-b.fw"; + char *name = "malo8335-h"; uint8_t *ucode; size_t size; int error, i; @@ -1863,7 +1863,7 @@ int malo_load_firmware(struct malo_softc *sc) { struct malo_cmdheader *hdr; - char *name = "mrv8k-f.fw"; + char *name = "malo8335-m"; void *data; uint8_t *ucode; size_t size, count, bsize; diff --git a/sys/dev/pcmcia/if_malo.c b/sys/dev/pcmcia/if_malo.c index 95412e56603..36d63de7276 100644 --- a/sys/dev/pcmcia/if_malo.c +++ b/sys/dev/pcmcia/if_malo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_malo.c,v 1.1 2007/05/25 05:33:51 mglocker Exp $ */ +/* $OpenBSD: if_malo.c,v 1.2 2007/05/25 18:31:01 mglocker Exp $ */ /* * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> @@ -323,7 +323,7 @@ cmalo_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) int cmalo_fw_load_helper(struct malo_softc *sc) { - const char *name = "mrv8385-h.fw"; + const char *name = "malo8385-h"; size_t usize; uint8_t *ucode, val8; int offset, error, bsize, i; @@ -391,7 +391,7 @@ cmalo_fw_load_helper(struct malo_softc *sc) int cmalo_fw_load_main(struct malo_softc *sc) { - const char *name = "mrv8385-m.fw"; + const char *name = "malo8385-m"; size_t usize; uint8_t *ucode; uint16_t val16; |