FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-15 13:22:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: use ETHTOOL_FWVERS_LEN instead of ETHTOOL_BUSINFO_LEN for fw_ver strings

Browse Source 
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko 2013-01-06 02:12:51 +00:00 committed by David S. Miller
parent 7826d43f2d
commit 81135548e6
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/ath/ath9k/htc_drv_init.c
View File

@ -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_major = be16_to_cpu(cmd_rsp.major);
priv->fw_version_minor = be16_to_cpu(cmd_rsp.minor); 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_major,
priv->fw_version_minor); priv->fw_version_minor);

2
drivers/net/wireless/iwlwifi/iwl-fw.h
View File

@ -157,7 +157,7 @@ struct fw_img {
struct iwl_fw { struct iwl_fw {
u32 ucode_ver; u32 ucode_ver;
char fw_version[ETHTOOL_BUSINFO_LEN]; char fw_version[ETHTOOL_FWVERS_LEN];
/* ucode images */ /* ucode images */
struct fw_img img[IWL_UCODE_TYPE_MAX]; struct fw_img img[IWL_UCODE_TYPE_MAX];

4
drivers/net/wireless/ti/wlcore/wlcore_i.h
View File

@ -122,9 +122,9 @@ enum {
struct wl1271_chip { struct wl1271_chip {
u32 id; u32 id;
char fw_ver_str[ETHTOOL_BUSINFO_LEN]; char fw_ver_str[ETHTOOL_FWVERS_LEN];
unsigned int fw_ver[NUM_FW_VER]; 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 #define NUM_TX_QUEUES 4

2
include/net/cfg80211.h
View File

@ -2333,7 +2333,7 @@ struct wiphy {
u32 rts_threshold; u32 rts_threshold;
u8 coverage_class; u8 coverage_class;
char fw_version[ETHTOOL_BUSINFO_LEN]; char fw_version[ETHTOOL_FWVERS_LEN];
u32 hw_version; u32 hw_version;
#ifdef CONFIG_PM #ifdef CONFIG_PM