aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2013-01-05 21:12:51 -0500
committerDavid S. Miller <davem@davemloft.net>2013-01-07 00:06:31 -0500
commit81135548e697a24ab41944c4354953a71b0b9efe (patch)
treee909fe6680a88c12251e505e2bf0cfd09cbff976 /drivers/net/wireless
parent7826d43f2db45c9305a6e0ba165650e1a203f517 (diff)
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>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/ath/ath9k/htc_drv_init.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-fw.h2
-rw-r--r--drivers/net/wireless/ti/wlcore/wlcore_i.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index 05d5ba66cac3..b2f85cb5ed30 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -783,7 +783,7 @@ static int ath9k_init_firmware_version(struct ath9k_htc_priv *priv)
783 priv->fw_version_major = be16_to_cpu(cmd_rsp.major); 783 priv->fw_version_major = be16_to_cpu(cmd_rsp.major);
784 priv->fw_version_minor = be16_to_cpu(cmd_rsp.minor); 784 priv->fw_version_minor = be16_to_cpu(cmd_rsp.minor);
785 785
786 snprintf(hw->wiphy->fw_version, ETHTOOL_BUSINFO_LEN, "%d.%d", 786 snprintf(hw->wiphy->fw_version, sizeof(hw->wiphy->fw_version), "%d.%d",
787 priv->fw_version_major, 787 priv->fw_version_major,
788 priv->fw_version_minor); 788 priv->fw_version_minor);
789 789
diff --git a/drivers/net/wireless/iwlwifi/iwl-fw.h b/drivers/net/wireless/iwlwifi/iwl-fw.h
index d1a86b66bc51..715291eb7f8e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fw.h
@@ -157,7 +157,7 @@ struct fw_img {
157struct iwl_fw { 157struct iwl_fw {
158 u32 ucode_ver; 158 u32 ucode_ver;
159 159
160 char fw_version[ETHTOOL_BUSINFO_LEN]; 160 char fw_version[ETHTOOL_FWVERS_LEN];
161 161
162 /* ucode images */ 162 /* ucode images */
163 struct fw_img img[IWL_UCODE_TYPE_MAX]; 163 struct fw_img img[IWL_UCODE_TYPE_MAX];
diff --git a/drivers/net/wireless/ti/wlcore/wlcore_i.h b/drivers/net/wireless/ti/wlcore/wlcore_i.h
index 6678d4b18611..5ce26cf402fc 100644
--- a/drivers/net/wireless/ti/wlcore/wlcore_i.h
+++ b/drivers/net/wireless/ti/wlcore/wlcore_i.h
@@ -122,9 +122,9 @@ enum {
122 122
123struct wl1271_chip { 123struct wl1271_chip {
124 u32 id; 124 u32 id;
125 char fw_ver_str[ETHTOOL_BUSINFO_LEN]; 125 char fw_ver_str[ETHTOOL_FWVERS_LEN];
126 unsigned int fw_ver[NUM_FW_VER]; 126 unsigned int fw_ver[NUM_FW_VER];
127 char phy_fw_ver_str[ETHTOOL_BUSINFO_LEN]; 127 char phy_fw_ver_str[ETHTOOL_FWVERS_LEN];
128}; 128};
129 129
130#define NUM_TX_QUEUES 4 130#define NUM_TX_QUEUES 4