aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/3com/3c589_cs.c
diff options
context:
space:
mode:
authorRick Jones <rick.jones2@hp.com>2011-11-07 08:29:27 -0500
committerDavid S. Miller <davem@davemloft.net>2011-11-08 15:11:57 -0500
commit68aad78c5023b8aa82da99b47f9d8cf40e8ca453 (patch)
treec9f90903bd2e7831ea6fc5231affa3b9fc908b73 /drivers/net/ethernet/3com/3c589_cs.c
parent34d2d89f2d7da3b72b3157e778bbf709047ded97 (diff)
sweep the floors and convert some .get_drvinfo routines to strlcpy
Per the mention made by Ben Hutchings that strlcpy is now the preferred string copy routine for a .get_drvinfo routine, do a bit of floor sweeping and convert some of the as-yet unconverted ethernet drivers to it. Signed-off-by: Rick Jones <rick.jones2@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/3com/3c589_cs.c')
-rw-r--r--drivers/net/ethernet/3com/3c589_cs.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ethernet/3com/3c589_cs.c b/drivers/net/ethernet/3com/3c589_cs.c
index 972f80ecc510..da410f036869 100644
--- a/drivers/net/ethernet/3com/3c589_cs.c
+++ b/drivers/net/ethernet/3com/3c589_cs.c
@@ -468,9 +468,10 @@ static void tc589_reset(struct net_device *dev)
468static void netdev_get_drvinfo(struct net_device *dev, 468static void netdev_get_drvinfo(struct net_device *dev,
469 struct ethtool_drvinfo *info) 469 struct ethtool_drvinfo *info)
470{ 470{
471 strcpy(info->driver, DRV_NAME); 471 strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
472 strcpy(info->version, DRV_VERSION); 472 strlcpy(info->version, DRV_VERSION, sizeof(info->version));
473 sprintf(info->bus_info, "PCMCIA 0x%lx", dev->base_addr); 473 snprintf(info->bus_info, sizeof(info->bus_info),
474 "PCMCIA 0x%lx", dev->base_addr);
474} 475}
475 476
476static const struct ethtool_ops netdev_ethtool_ops = { 477static const struct ethtool_ops netdev_ethtool_ops = {