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/sun/sunbmac.c | |
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/sun/sunbmac.c')
-rw-r--r-- | drivers/net/ethernet/sun/sunbmac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/sun/sunbmac.c b/drivers/net/ethernet/sun/sunbmac.c index be82f6d13c51..5fafca065305 100644 --- a/drivers/net/ethernet/sun/sunbmac.c +++ b/drivers/net/ethernet/sun/sunbmac.c | |||
@@ -1042,8 +1042,8 @@ static void bigmac_set_multicast(struct net_device *dev) | |||
1042 | /* Ethtool support... */ | 1042 | /* Ethtool support... */ |
1043 | static void bigmac_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) | 1043 | static void bigmac_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) |
1044 | { | 1044 | { |
1045 | strcpy(info->driver, "sunbmac"); | 1045 | strlcpy(info->driver, "sunbmac", sizeof(info->driver)); |
1046 | strcpy(info->version, "2.0"); | 1046 | strlcpy(info->version, "2.0", sizeof(info->version)); |
1047 | } | 1047 | } |
1048 | 1048 | ||
1049 | static u32 bigmac_get_link(struct net_device *dev) | 1049 | static u32 bigmac_get_link(struct net_device *dev) |