Re: [PATCH 1/2] brcm80211: Remove version number fromfilenames, matching the driver

[Henry Ptasinski]

On Sat, Jan 08, 2011 at 02:57:41PM -0800, Ben Hutchings wrote:
> The driver generates filenames like this:
> 
>                 sprintf(fw_name, "%s-%d.fw", wl_firmwares[i],
>                         UCODE_LOADER_API_VER);
>                 ...
>                 sprintf(fw_name, "%s_hdr-%d.fw", wl_firmwares[i],
>                         UCODE_LOADER_API_VER);
> 
> which implies the filenames should be:
> 
>     brcm/bcm43xx-0.fw
>     brcm/bcm43xx_hdr-0.fw
> 
> Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
> ---
>  WHENCE                          |    5 +++--
>  brcm/bcm43xx-0-610-809-0.fw     |  Bin 97376 -> 0 bytes
>  brcm/bcm43xx-0.fw               |  Bin 0 -> 97376 bytes
>  brcm/bcm43xx_hdr-0-610-809-0.fw |  Bin 180 -> 0 bytes
>  brcm/bcm43xx_hdr-0.fw           |  Bin 0 -> 180 bytes
>  5 files changed, 3 insertions(+), 2 deletions(-)
>  delete mode 100644 brcm/bcm43xx-0-610-809-0.fw
>  create mode 100644 brcm/bcm43xx-0.fw
>  delete mode 100644 brcm/bcm43xx_hdr-0-610-809-0.fw
>  create mode 100644 brcm/bcm43xx_hdr-0.fw
> 
> diff --git a/WHENCE b/WHENCE
> index 0bc162c..cec7478 100644
> --- a/WHENCE
> +++ b/WHENCE
> @@ -1403,8 +1403,9 @@ Licence:
>  
>  Driver: brcm80211 - Broadcom 802.11n wireless LAN driver.
>  
> -File: brcm/bcm43xx-0-610-809-0.fw
> -File: brcm/bcm43xx_hdr-0-610-809-0.fw
> +File: brcm/bcm43xx-0.fw
> +File: brcm/bcm43xx_hdr-0.fw
> +Version: 610.809.0
>  
>  Licence: Redistributable. See LICENCE.broadcom_bcm43xx for details.
>  
> [binary changes omitted]
> 

The brcmfmac files need renaming as well.  This patch (finally generated
with the -M flag) renames all the firmware files and fixes up the WHENCE: