From: Michael Straube <straube.linux@gmail.com>
To: gregkh@linuxfoundation.org
Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Michael Straube <straube.linux@gmail.com>
Subject: [PATCH v4 5/8] staging: r8188eu: use sizeof instead of hardcoded firmware header size
Date: Sun, 17 Apr 2022 19:54:38 +0200 [thread overview]
Message-ID: <20220417175441.13830-6-straube.linux@gmail.com> (raw)
In-Reply-To: <20220417175441.13830-1-straube.linux@gmail.com>
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.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
v4:
- no changes
v3:
- added the compile time size check from patch 8/8 of v2
v2:
- no changes
drivers/staging/r8188eu/core/rtw_fw.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188eu/core/rtw_fw.c
index a80cc7fa3a53..42b36505cf8b 100644
--- a/drivers/staging/r8188eu/core/rtw_fw.c
+++ b/drivers/staging/r8188eu/core/rtw_fw.c
@@ -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, */
--
2.35.1
next prev parent reply other threads:[~2022-04-17 17:54 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-17 17:54 [PATCH v4 0/8] staging: r8188eu: fix and clean up some firmware code Michael Straube
2022-04-17 17:54 ` [PATCH v4 1/8] staging: r8188eu: fix struct rt_firmware_hdr Michael Straube
2022-04-17 17:54 ` [PATCH v4 2/8] staging: r8188eu: convert u32 fields of rt_firmware_hdr to __le32 Michael Straube
2022-04-17 17:54 ` [PATCH v4 3/8] staging: r8188eu: clean up comments in struct rt_firmware_hdr Michael Straube
2022-04-17 17:54 ` [PATCH v4 4/8] staging: r8188eu: rename fields of " Michael Straube
2022-04-17 17:54 ` Michael Straube [this message]
2022-04-17 17:54 ` [PATCH v4 6/8] staging: r8188eu: remove variables from rtl8188e_firmware_download() Michael Straube
2022-04-17 17:54 ` [PATCH v4 7/8] staging: r8188eu: use pr_info_once() to log the firmware version Michael Straube
2022-04-17 17:54 ` [PATCH v4 8/8] staging: r8188eu: check firmware header existence before access Michael Straube
2022-04-17 18:24 ` [PATCH v4 0/8] staging: r8188eu: fix and clean up some firmware code Larry Finger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220417175441.13830-6-straube.linux@gmail.com \
--to=straube.linux@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=phil@philpotter.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox