mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-15 13:22:55 +00:00
net: use ETHTOOL_FWVERS_LEN instead of ETHTOOL_BUSINFO_LEN for fw_ver strings
Signed-off-by: Jiri Pirko <jiri@resnulli.us> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
7826d43f2d
commit
81135548e6
@ -783,7 +783,7 @@ static int ath9k_init_firmware_version(struct ath9k_htc_priv *priv)
|
||||
priv->fw_version_major = be16_to_cpu(cmd_rsp.major);
|
||||
priv->fw_version_minor = be16_to_cpu(cmd_rsp.minor);
|
||||
|
||||
snprintf(hw->wiphy->fw_version, ETHTOOL_BUSINFO_LEN, "%d.%d",
|
||||
snprintf(hw->wiphy->fw_version, sizeof(hw->wiphy->fw_version), "%d.%d",
|
||||
priv->fw_version_major,
|
||||
priv->fw_version_minor);
|
||||
|
||||
|
@ -157,7 +157,7 @@ struct fw_img {
|
||||
struct iwl_fw {
|
||||
u32 ucode_ver;
|
||||
|
||||
char fw_version[ETHTOOL_BUSINFO_LEN];
|
||||
char fw_version[ETHTOOL_FWVERS_LEN];
|
||||
|
||||
/* ucode images */
|
||||
struct fw_img img[IWL_UCODE_TYPE_MAX];
|
||||
|
@ -122,9 +122,9 @@ enum {
|
||||
|
||||
struct wl1271_chip {
|
||||
u32 id;
|
||||
char fw_ver_str[ETHTOOL_BUSINFO_LEN];
|
||||
char fw_ver_str[ETHTOOL_FWVERS_LEN];
|
||||
unsigned int fw_ver[NUM_FW_VER];
|
||||
char phy_fw_ver_str[ETHTOOL_BUSINFO_LEN];
|
||||
char phy_fw_ver_str[ETHTOOL_FWVERS_LEN];
|
||||
};
|
||||
|
||||
#define NUM_TX_QUEUES 4
|
||||
|
@ -2333,7 +2333,7 @@ struct wiphy {
|
||||
u32 rts_threshold;
|
||||
u8 coverage_class;
|
||||
|
||||
char fw_version[ETHTOOL_BUSINFO_LEN];
|
||||
char fw_version[ETHTOOL_FWVERS_LEN];
|
||||
u32 hw_version;
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
|
Loading…
Reference in New Issue
Block a user