aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/dlink/dl2k.c
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2013-01-05 19:44:26 -0500
committerDavid S. Miller <davem@davemloft.net>2013-01-07 00:06:31 -0500
commit7826d43f2db45c9305a6e0ba165650e1a203f517 (patch)
treea8659c995a37f58db809da9537aafac178431f31 /drivers/net/ethernet/dlink/dl2k.c
parent2afb9b533423a9b97f84181e773cf9361d98fed6 (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/dlink/dl2k.c')
-rw-r--r--drivers/net/ethernet/dlink/dl2k.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ethernet/dlink/dl2k.c b/drivers/net/ethernet/dlink/dl2k.c
index 1d342d37915c..110d26f4c602 100644
--- a/drivers/net/ethernet/dlink/dl2k.c
+++ b/drivers/net/ethernet/dlink/dl2k.c
@@ -1156,9 +1156,10 @@ set_multicast (struct net_device *dev)
1156static void rio_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) 1156static void rio_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
1157{ 1157{
1158 struct netdev_private *np = netdev_priv(dev); 1158 struct netdev_private *np = netdev_priv(dev);
1159 strcpy(info->driver, "dl2k"); 1159
1160 strcpy(info->version, DRV_VERSION); 1160 strlcpy(info->driver, "dl2k", sizeof(info->driver));
1161 strcpy(info->bus_info, pci_name(np->pdev)); 1161 strlcpy(info->version, DRV_VERSION, sizeof(info->version));
1162 strlcpy(info->bus_info, pci_name(np->pdev), sizeof(info->bus_info));
1162} 1163}
1163 1164
1164static int rio_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) 1165static int rio_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)