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/i825xx | |
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/i825xx')
-rw-r--r-- | drivers/net/ethernet/i825xx/eepro.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ethernet/i825xx/eepro.c b/drivers/net/ethernet/i825xx/eepro.c index 067c46069a11..114cda7721fe 100644 --- a/drivers/net/ethernet/i825xx/eepro.c +++ b/drivers/net/ethernet/i825xx/eepro.c | |||
@@ -1726,9 +1726,10 @@ static int eepro_ethtool_get_settings(struct net_device *dev, | |||
1726 | static void eepro_ethtool_get_drvinfo(struct net_device *dev, | 1726 | static void eepro_ethtool_get_drvinfo(struct net_device *dev, |
1727 | struct ethtool_drvinfo *drvinfo) | 1727 | struct ethtool_drvinfo *drvinfo) |
1728 | { | 1728 | { |
1729 | strcpy(drvinfo->driver, DRV_NAME); | 1729 | strlcpy(drvinfo->driver, DRV_NAME, sizeof(drvinfo->driver)); |
1730 | strcpy(drvinfo->version, DRV_VERSION); | 1730 | strlcpy(drvinfo->version, DRV_VERSION, sizeof(drvinfo->version)); |
1731 | sprintf(drvinfo->bus_info, "ISA 0x%lx", dev->base_addr); | 1731 | snprintf(drvinfo->bus_info, sizeof(drvinfo->bus_info), |
1732 | "ISA 0x%lx", dev->base_addr); | ||
1732 | } | 1733 | } |
1733 | 1734 | ||
1734 | static const struct ethtool_ops eepro_ethtool_ops = { | 1735 | static const struct ethtool_ops eepro_ethtool_ops = { |