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>
This commit is contained in:

committed by
David S. Miller

parent
34d2d89f2d
commit
68aad78c50
@@ -310,10 +310,12 @@ static void atl1e_get_drvinfo(struct net_device *netdev,
|
||||
{
|
||||
struct atl1e_adapter *adapter = netdev_priv(netdev);
|
||||
|
||||
strncpy(drvinfo->driver, atl1e_driver_name, 32);
|
||||
strncpy(drvinfo->version, atl1e_driver_version, 32);
|
||||
strncpy(drvinfo->fw_version, "L1e", 32);
|
||||
strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);
|
||||
strlcpy(drvinfo->driver, atl1e_driver_name, sizeof(drvinfo->driver));
|
||||
strlcpy(drvinfo->version, atl1e_driver_version,
|
||||
sizeof(drvinfo->version));
|
||||
strlcpy(drvinfo->fw_version, "L1e", sizeof(drvinfo->fw_version));
|
||||
strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),
|
||||
sizeof(drvinfo->bus_info));
|
||||
drvinfo->n_stats = 0;
|
||||
drvinfo->testinfo_len = 0;
|
||||
drvinfo->regdump_len = atl1e_get_regs_len(netdev);
|
||||
|
@@ -2049,10 +2049,12 @@ static void atl2_get_drvinfo(struct net_device *netdev,
|
||||
{
|
||||
struct atl2_adapter *adapter = netdev_priv(netdev);
|
||||
|
||||
strncpy(drvinfo->driver, atl2_driver_name, 32);
|
||||
strncpy(drvinfo->version, atl2_driver_version, 32);
|
||||
strncpy(drvinfo->fw_version, "L2", 32);
|
||||
strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);
|
||||
strlcpy(drvinfo->driver, atl2_driver_name, sizeof(drvinfo->driver));
|
||||
strlcpy(drvinfo->version, atl2_driver_version,
|
||||
sizeof(drvinfo->version));
|
||||
strlcpy(drvinfo->fw_version, "L2", sizeof(drvinfo->fw_version));
|
||||
strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),
|
||||
sizeof(drvinfo->bus_info));
|
||||
drvinfo->n_stats = 0;
|
||||
drvinfo->testinfo_len = 0;
|
||||
drvinfo->regdump_len = atl2_get_regs_len(netdev);
|
||||
|
Reference in New Issue
Block a user