On Friday 26 January 2007 14:53, Matthew Garrett wrote:
> This patch alters the dscape version of the bcm43xx driver to explicitly
> request version 4 firmware.
NACK.
Use "fwpostfix" module parameter.
This patch as absolutely zero chance to get in.
> Signed-off-by: Matthew Garrett <[EMAIL PROTECTED]>
>
> ---
> diff --git a/drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c
> b/drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c
> index 9f4d51d..4f11ce8 100644
> --- a/drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c
> +++ b/drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c
> @@ -1544,7 +1544,7 @@ static int bcm43xx_request_firmware(struct
> bcm43xx_wldev *dev)
> char buf[22 + sizeof(modparam_fwpostfix) - 1] = { 0 };
>
> if (!phy->ucode) {
> - snprintf(buf, ARRAY_SIZE(buf), "bcm43xx_microcode%d%s.fw",
> + snprintf(buf, ARRAY_SIZE(buf), "bcm43xx_v4_microcode%d%s.fw",
> (rev >= 5 ? 5 : rev),
> modparam_fwpostfix);
> err = request_firmware(&phy->ucode, buf, &dev->dev->dev);
> @@ -1558,7 +1558,7 @@ static int bcm43xx_request_firmware(struct
> bcm43xx_wldev *dev)
>
> if (!phy->pcm) {
> snprintf(buf, ARRAY_SIZE(buf),
> - "bcm43xx_pcm%d%s.fw",
> + "bcm43xx_v4_pcm%d%s.fw",
> (rev < 5 ? 4 : 5),
> modparam_fwpostfix);
> err = request_firmware(&phy->pcm, buf, &dev->dev->dev);
> @@ -1598,7 +1598,7 @@ static int bcm43xx_request_firmware(struct
> bcm43xx_wldev *dev)
> }
> } else
> goto err_noinitval;
> - snprintf(buf, ARRAY_SIZE(buf), "bcm43xx_initval%02d%s.fw",
> + snprintf(buf, ARRAY_SIZE(buf), "bcm43xx_v4_initval%02d%s.fw",
> nr, modparam_fwpostfix);
>
> err = request_firmware(&phy->initvals0, buf, &dev->dev->dev);
> @@ -1633,7 +1633,7 @@ static int bcm43xx_request_firmware(struct
> bcm43xx_wldev *dev)
> default:
> goto err_noinitval;
> }
> - snprintf(buf, ARRAY_SIZE(buf),
> "bcm43xx_initval%02d%s.fw",
> + snprintf(buf, ARRAY_SIZE(buf),
> "bcm43xx_v4_initval%02d%s.fw",
> nr, modparam_fwpostfix);
>
> err = request_firmware(&phy->initvals1, buf,
> &dev->dev->dev);
>
>
--
Greetings Michael.
_______________________________________________
Bcm43xx-dev mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/bcm43xx-dev
