UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mwifiex: Use a define for firmware version string length 

Since the version string we get from the firmware is always 128
characters long, use a define for this size instead of having the number
128 copied all over the place.

Signed-off-by: Jonas Dreßler <verdre@v0yd.nl>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20211103201800.13531-2-verdre@v0yd.nl
This commit is contained in:
Jonas Dreßler 2021-11-03 21:17:58 +01:00 committed by Kalle Valo
parent 04d80663f6
commit 2d1d7091dd
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/marvell/mwifiex/fw.h
View File

@ -2071,9 +2071,11 @@ struct mwifiex_ie_types_robust_coex {
__le32 mode; __le32 mode;
} __packed; } __packed;
#define MWIFIEX_VERSION_STR_LENGTH 128
struct host_cmd_ds_version_ext { struct host_cmd_ds_version_ext {
u8 version_str_sel; u8 version_str_sel;
char version_str[128]; char version_str[MWIFIEX_VERSION_STR_LENGTH];
} __packed; } __packed;
struct host_cmd_ds_mgmt_frame_reg { struct host_cmd_ds_mgmt_frame_reg {

2
drivers/net/wireless/marvell/mwifiex/main.h
View File

@ -646,7 +646,7 @@ struct mwifiex_private {
struct wireless_dev wdev; struct wireless_dev wdev;
struct mwifiex_chan_freq_power cfp; struct mwifiex_chan_freq_power cfp;
u32 versionstrsel; u32 versionstrsel;
char version_str[128]; char version_str[MWIFIEX_VERSION_STR_LENGTH];
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
struct dentry *dfs_dev_dir; struct dentry *dfs_dev_dir;
#endif #endif

5
drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
View File

@ -711,8 +711,9 @@ static int mwifiex_ret_ver_ext(struct mwifiex_private *priv,
if (version_ext) { if (version_ext) {
version_ext->version_str_sel = ver_ext->version_str_sel; version_ext->version_str_sel = ver_ext->version_str_sel;
memcpy(version_ext->version_str, ver_ext->version_str, memcpy(version_ext->version_str, ver_ext->version_str,
sizeof(char) * 128); MWIFIEX_VERSION_STR_LENGTH);
memcpy(priv->version_str, ver_ext->version_str, 128); memcpy(priv->version_str, ver_ext->version_str,
MWIFIEX_VERSION_STR_LENGTH);
} }
return 0; return 0;
} }