aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/marvell/sky2.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/marvell/sky2.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/marvell/sky2.c')
-rw-r--r--drivers/net/ethernet/marvell/sky2.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index fdc6c394c683..553d1a315b3a 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -3623,10 +3623,11 @@ static void sky2_get_drvinfo(struct net_device *dev,
3623{ 3623{
3624 struct sky2_port *sky2 = netdev_priv(dev); 3624 struct sky2_port *sky2 = netdev_priv(dev);
3625 3625
3626 strcpy(info->driver, DRV_NAME); 3626 strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
3627 strcpy(info->version, DRV_VERSION); 3627 strlcpy(info->version, DRV_VERSION, sizeof(info->version));
3628 strcpy(info->fw_version, "N/A"); 3628 strlcpy(info->fw_version, "N/A", sizeof(info->fw_version));
3629 strcpy(info->bus_info, pci_name(sky2->hw->pdev)); 3629 strlcpy(info->bus_info, pci_name(sky2->hw->pdev),
3630 sizeof(info->bus_info));
3630} 3631}
3631 3632
3632static const struct sky2_stat { 3633static const struct sky2_stat {