diff options
| author | joerg <joerg@NetBSD.org> | 2008-11-07 14:58:27 +0000 |
|---|---|---|
| committer | joerg <joerg@NetBSD.org> | 2008-11-07 14:58:27 +0000 |
| commit | 866b295da871dff5a93d3df173ecd4c261acd380 (patch) | |
| tree | 3b75e788aa0f24dd65338bcdeb9e01acdbbed5c7 /sys/dev | |
| parent | a9e7045184ad1e26f6a4c76705c6af8cd79a501e (diff) | |
Match image name with upstream distfiles.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/if_ipw.c | 15 | ||||
| -rw-r--r-- | sys/dev/pci/if_ipwvar.h | 4 | ||||
| -rw-r--r-- | sys/dev/pci/if_iwi.c | 12 | ||||
| -rw-r--r-- | sys/dev/pci/if_iwn.c | 6 |
4 files changed, 17 insertions, 20 deletions
diff --git a/sys/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c index 41ba7ee63b1..f923e67c543 100644 --- a/sys/dev/pci/if_ipw.c +++ b/sys/dev/pci/if_ipw.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ipw.c,v 1.43 2008/11/07 00:20:07 dyoung Exp $ */ +/* $NetBSD: if_ipw.c,v 1.44 2008/11/07 14:58:27 joerg Exp $ */ /* FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.15 2005/11/13 17:17:40 damien Exp */ /*- @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.43 2008/11/07 00:20:07 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.44 2008/11/07 14:58:27 joerg Exp $"); /*- * Intel(R) PRO/Wireless 2100 MiniPCI driver @@ -213,7 +213,7 @@ ipw_attach(struct device *parent, struct device *self, void *aux) sc->sc_st = memt; sc->sc_sh = memh; sc->sc_dmat = pa->pa_dmat; - strlcpy(sc->sc_fwname, "ipw2100-1.2.fw", sizeof(sc->sc_fwname)); + sc->sc_fwname = "ipw2100-1.2.fw"; /* disable interrupts */ CSR_WRITE_4(sc, IPW_CSR_INTR_MASK, 0); @@ -1646,14 +1646,11 @@ ipw_ioctl(struct ifnet *ifp, u_long cmd, void *data) case SIOCSIFMEDIA: if (ifr->ifr_media & IFM_IEEE80211_ADHOC) - strlcpy(sc->sc_fwname, "ipw2100-1.2-i.fw", - sizeof(sc->sc_fwname)); + sc->sc_fwname = "ipw2100-1.2-i.fw"; else if (ifr->ifr_media & IFM_IEEE80211_MONITOR) - strlcpy(sc->sc_fwname, "ipw2100-1.2-p.fw", - sizeof(sc->sc_fwname)); + sc->sc_fwname = "ipw2100-1.2-p.fw"; else - strlcpy(sc->sc_fwname, "ipw2100-1.2.fw", - sizeof(sc->sc_fwname)); + sc->sc_fwname = "ipw2100-1.2.fw"; ipw_free_firmware(sc); /* FALLTRHOUGH */ diff --git a/sys/dev/pci/if_ipwvar.h b/sys/dev/pci/if_ipwvar.h index 8000be7b1f7..8e1db786019 100644 --- a/sys/dev/pci/if_ipwvar.h +++ b/sys/dev/pci/if_ipwvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: if_ipwvar.h,v 1.13 2008/05/27 21:42:08 dyoung Exp $ */ +/* $NetBSD: if_ipwvar.h,v 1.14 2008/11/07 14:58:27 joerg Exp $ */ /*- * Copyright (c) 2004 @@ -89,7 +89,7 @@ struct ipw_softc { enum ieee80211_state, int); struct ipw_firmware fw; - char sc_fwname[24]; + const char *sc_fwname; uint32_t flags; #define IPW_FLAG_FW_CACHED (1 << 0) #define IPW_FLAG_FW_INITED (1 << 1) diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c index ad569f2ee5b..652f04ba5ba 100644 --- a/sys/dev/pci/if_iwi.c +++ b/sys/dev/pci/if_iwi.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_iwi.c,v 1.75 2008/11/07 00:20:07 dyoung Exp $ */ +/* $NetBSD: if_iwi.c,v 1.76 2008/11/07 14:58:27 joerg Exp $ */ /*- * Copyright (c) 2004, 2005 @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.75 2008/11/07 00:20:07 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.76 2008/11/07 14:58:27 joerg Exp $"); /*- * Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver @@ -329,7 +329,7 @@ iwi_attach(device_t parent, device_t self, void *aux) ic->ic_opmode = IEEE80211_M_STA; /* default to BSS mode */ ic->ic_state = IEEE80211_S_INIT; - sc->sc_fwname = "iwi-bss.fw"; + sc->sc_fwname = "ipw200-bss.fw"; /* set device capabilities */ ic->ic_caps = @@ -1855,11 +1855,11 @@ iwi_ioctl(struct ifnet *ifp, u_long cmd, void *data) case SIOCSIFMEDIA: if (ifr->ifr_media & IFM_IEEE80211_ADHOC) { - sc->sc_fwname = "iwi-ibss.fw"; + sc->sc_fwname = "ipw2200-ibss.fw"; } else if (ifr->ifr_media & IFM_IEEE80211_MONITOR) { - sc->sc_fwname = "iwi-sniffer.fw"; + sc->sc_fwname = "ipw2200-sniffer.fw"; } else { - sc->sc_fwname = "iwi-bss.fw"; + sc->sc_fwname = "ipw2200-bss.fw"; } error = iwi_cache_firmware(sc); if (error) diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c index df1643322ec..3b24e0a9479 100644 --- a/sys/dev/pci/if_iwn.c +++ b/sys/dev/pci/if_iwn.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_iwn.c,v 1.25 2008/11/07 00:20:07 dyoung Exp $ */ +/* $NetBSD: if_iwn.c,v 1.26 2008/11/07 14:58:27 joerg Exp $ */ /*- * Copyright (c) 2007 @@ -18,7 +18,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.25 2008/11/07 00:20:07 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.26 2008/11/07 14:58:27 joerg Exp $"); /* @@ -1233,7 +1233,7 @@ iwn_load_firmware(struct iwn_softc *sc) int error; /* load firmware image from disk */ - if ((error = firmware_open("if_iwn","iwlwifi-4965.ucode", &fw)) != 0) { + if ((error = firmware_open("if_iwn","iwlwifi-4965-1.ucode", &fw)) != 0) { aprint_error_dev(sc->sc_dev, "could not read firmware file\n"); goto fail1; } |
