Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81135548 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

net: use ETHTOOL_FWVERS_LEN instead of ETHTOOL_BUSINFO_LEN for fw_ver strings 



Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7826d43f

drivers/net/wireless/ath/ath9k/htc_drv_init.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/iwlwifi/iwl-fw.h

+1 −1
Original line number Diff line number Diff line
@@ -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];

drivers/net/wireless/ti/wlcore/wlcore_i.h

+2 −2
Original line number Diff line number Diff line
@@ -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

include/net/cfg80211.h

+1 −1
Original line number Diff line number Diff line
@@ -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