Commit 4e58dfad authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: use sizeof instead of hardcoded firmware header size 



Use sizeof() instead of hardcoding the firmware header size and add
a compile time check to ensure struct rt_firmware_hdr has the correct
size.

Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220417175441.13830-6-straube.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 60ca4cdf

drivers/staging/r8188eu/core/rtw_fw.c

+4 −3
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ struct rt_firmware_hdr { 
	__le32	rsvd5;

};



static_assert(sizeof(struct rt_firmware_hdr) == 32);



static void fw_download_enable(struct adapter *padapter, bool enable)

{

	u8 tmp;
@@ -268,9 +270,8 @@ int rtl8188e_firmware_download(struct adapter *padapter) 
			DRIVER_PREFIX, fw_version, fw_subversion, fw_signature);



	if (IS_FW_HEADER_EXIST(fwhdr)) {

		/*  Shift 32 bytes for FW header */

		fw_data = fw_data + 32;

		fw_size = fw_size - 32;

		fw_data = fw_data + sizeof(struct rt_firmware_hdr);

		fw_size = fw_size - sizeof(struct rt_firmware_hdr);

	}



	/*  Suggested by Filen. If 8051 is running in RAM code, driver should inform Fw to reset by itself, */