diff options
author | Jiri Pirko <jiri@resnulli.us> | 2013-01-05 19:44:26 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-01-07 00:06:31 -0500 |
commit | 7826d43f2db45c9305a6e0ba165650e1a203f517 (patch) | |
tree | a8659c995a37f58db809da9537aafac178431f31 /drivers/net/ethernet/xircom | |
parent | 2afb9b533423a9b97f84181e773cf9361d98fed6 (diff) |
ethtool: fix drvinfo strings set in drivers
Use strlcpy where possible to ensure the string is \0 terminated.
Use always sizeof(string) instead of 32, ETHTOOL_BUSINFO_LEN
and custom defines.
Use snprintf instead of sprint.
Remove unnecessary inits of ->fw_version
Remove unnecessary inits of drvinfo struct.
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/xircom')
-rw-r--r-- | drivers/net/ethernet/xircom/xirc2ps_cs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/xircom/xirc2ps_cs.c b/drivers/net/ethernet/xircom/xirc2ps_cs.c index 94a1f94f74b8..98e09d0d3ce2 100644 --- a/drivers/net/ethernet/xircom/xirc2ps_cs.c +++ b/drivers/net/ethernet/xircom/xirc2ps_cs.c | |||
@@ -1412,7 +1412,8 @@ static void netdev_get_drvinfo(struct net_device *dev, | |||
1412 | struct ethtool_drvinfo *info) | 1412 | struct ethtool_drvinfo *info) |
1413 | { | 1413 | { |
1414 | strlcpy(info->driver, "xirc2ps_cs", sizeof(info->driver)); | 1414 | strlcpy(info->driver, "xirc2ps_cs", sizeof(info->driver)); |
1415 | sprintf(info->bus_info, "PCMCIA 0x%lx", dev->base_addr); | 1415 | snprintf(info->bus_info, sizeof(info->bus_info), "PCMCIA 0x%lx", |
1416 | dev->base_addr); | ||
1416 | } | 1417 | } |
1417 | 1418 | ||
1418 | static const struct ethtool_ops netdev_ethtool_ops = { | 1419 | static const struct ethtool_ops netdev_ethtool_ops = { |