Commit 2d1d7091 authored by Jonas Dreßler's avatar Jonas Dreßler Committed by Kalle Valo
Browse files

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: default avatarJonas Dreßler <verdre@v0yd.nl>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20211103201800.13531-2-verdre@v0yd.nl
parent 04d80663

drivers/net/wireless/marvell/mwifiex/fw.h

+3 −1
Original line number Diff line number Diff line
@@ -2071,9 +2071,11 @@ struct mwifiex_ie_types_robust_coex { 
	__le32 mode;

} __packed;



#define MWIFIEX_VERSION_STR_LENGTH  128



struct host_cmd_ds_version_ext {

	u8 version_str_sel;

	char version_str[128];

	char version_str[MWIFIEX_VERSION_STR_LENGTH];

} __packed;



struct host_cmd_ds_mgmt_frame_reg {

drivers/net/wireless/marvell/mwifiex/main.h

+1 −1
Original line number Diff line number Diff line
@@ -646,7 +646,7 @@ struct mwifiex_private { 
	struct wireless_dev wdev;

	struct mwifiex_chan_freq_power cfp;

	u32 versionstrsel;

	char version_str[128];

	char version_str[MWIFIEX_VERSION_STR_LENGTH];

#ifdef CONFIG_DEBUG_FS

	struct dentry *dfs_dev_dir;

#endif

drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c

+3 −2
Original line number Diff line number Diff line
@@ -711,8 +711,9 @@ static int mwifiex_ret_ver_ext(struct mwifiex_private *priv, 
	if (version_ext) {

		version_ext->version_str_sel = ver_ext->version_str_sel;

		memcpy(version_ext->version_str, ver_ext->version_str,

		       sizeof(char) * 128);

		memcpy(priv->version_str, ver_ext->version_str, 128);

		       MWIFIEX_VERSION_STR_LENGTH);

		memcpy(priv->version_str, ver_ext->version_str,

		       MWIFIEX_VERSION_STR_LENGTH);

	}

	return 0;

}