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/macvlan.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/macvlan.c')
-rw-r--r-- | drivers/net/macvlan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 0ae45182f40d..1047e5875801 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c | |||
@@ -585,8 +585,8 @@ static int macvlan_fdb_del(struct ndmsg *ndm, | |||
585 | static void macvlan_ethtool_get_drvinfo(struct net_device *dev, | 585 | static void macvlan_ethtool_get_drvinfo(struct net_device *dev, |
586 | struct ethtool_drvinfo *drvinfo) | 586 | struct ethtool_drvinfo *drvinfo) |
587 | { | 587 | { |
588 | snprintf(drvinfo->driver, 32, "macvlan"); | 588 | strlcpy(drvinfo->driver, "macvlan", sizeof(drvinfo->driver)); |
589 | snprintf(drvinfo->version, 32, "0.1"); | 589 | strlcpy(drvinfo->version, "0.1", sizeof(drvinfo->version)); |
590 | } | 590 | } |
591 | 591 | ||
592 | static int macvlan_ethtool_get_settings(struct net_device *dev, | 592 | static int macvlan_ethtool_get_settings(struct net_device *dev, |