RE: [PATCH rtw-next] wifi: rtw89: Fill fw_version member of struct wiphy

[Ping-Ke Shih <pkshih@realtek.com>]

Bitterblue Smith <rtl8821cerfe2@gmail.com> wrote:
> Let userspace tools like lshw show the firmware version by filling the
> fw_version member of struct wiphy.
> 
> Before:
> 
> configuration: broadcast=yes driver=rtw89_8852au
> driverversion=6.19.6-arch1-1 firmware=N/A link=no multicast=yes
> wireless=IEEE 802.11
> 
> After:
> 
> configuration: broadcast=yes driver=rtw89_8852au
> driverversion=6.19.6-arch1-1 firmware=0.13.36.2 link=no multicast=yes
> wireless=IEEE 802.11
> 
> Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
> ---
>  drivers/net/wireless/realtek/rtw89/fw.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/drivers/net/wireless/realtek/rtw89/fw.c
> b/drivers/net/wireless/realtek/rtw89/fw.c
> index 45d8c5e70084..55aee6eb8478 100644
> --- a/drivers/net/wireless/realtek/rtw89/fw.c
> +++ b/drivers/net/wireless/realtek/rtw89/fw.c
> @@ -755,6 +755,14 @@ static int rtw89_fw_update_ver(struct rtw89_dev *rtwdev,
>                    fw_suit->major_ver, fw_suit->minor_ver, fw_suit->sub_ver,
>                    fw_suit->sub_idex, fw_suit->commitid, fw_suit->cmd_ver,
> type);
> 
> +       if (type == RTW89_FW_NORMAL || type == RTW89_FW_NORMAL_CE ||
> +           type == RTW89_FW_NORMAL_B)
> +               snprintf(rtwdev->hw->wiphy->fw_version,
> +                        sizeof(rtwdev->hw->wiphy->fw_version),

nit: how about defining a local variable wiphy? as well as rtw88.

> +                        "%u.%u.%u.%u",
> +                        fw_suit->major_ver, fw_suit->minor_ver,
> +                        fw_suit->sub_ver, fw_suit->sub_idex);
> +
>         return 0;
>  }
> 
> --
> 2.53.0