diff options
author | Rick Jones <rick.jones2@hp.com> | 2011-11-07 08:29:27 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-11-08 15:11:57 -0500 |
commit | 68aad78c5023b8aa82da99b47f9d8cf40e8ca453 (patch) | |
tree | c9f90903bd2e7831ea6fc5231affa3b9fc908b73 /drivers/net/ethernet/dec/tulip/dmfe.c | |
parent | 34d2d89f2d7da3b72b3157e778bbf709047ded97 (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/dec/tulip/dmfe.c')
-rw-r--r-- | drivers/net/ethernet/dec/tulip/dmfe.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ethernet/dec/tulip/dmfe.c b/drivers/net/ethernet/dec/tulip/dmfe.c index 17b11ee1745a..51f7542eb451 100644 --- a/drivers/net/ethernet/dec/tulip/dmfe.c +++ b/drivers/net/ethernet/dec/tulip/dmfe.c | |||
@@ -1085,10 +1085,11 @@ static void dmfe_ethtool_get_drvinfo(struct net_device *dev, | |||
1085 | { | 1085 | { |
1086 | struct dmfe_board_info *np = netdev_priv(dev); | 1086 | struct dmfe_board_info *np = netdev_priv(dev); |
1087 | 1087 | ||
1088 | strcpy(info->driver, DRV_NAME); | 1088 | strlcpy(info->driver, DRV_NAME, sizeof(info->driver)); |
1089 | strcpy(info->version, DRV_VERSION); | 1089 | strlcpy(info->version, DRV_VERSION, sizeof(info->version)); |
1090 | if (np->pdev) | 1090 | if (np->pdev) |
1091 | strcpy(info->bus_info, pci_name(np->pdev)); | 1091 | strlcpy(info->bus_info, pci_name(np->pdev), |
1092 | sizeof(info->bus_info)); | ||
1092 | else | 1093 | else |
1093 | sprintf(info->bus_info, "EISA 0x%lx %d", | 1094 | sprintf(info->bus_info, "EISA 0x%lx %d", |
1094 | dev->base_addr, dev->irq); | 1095 | dev->base_addr, dev->irq); |