diff options
author | Rick Jones <rick.jones2@hp.com> | 2011-11-14 03:13:25 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-11-14 14:13:31 -0500 |
commit | 612a94d6f24eb2427eabf554392080302da664dd (patch) | |
tree | 00202ffa2c3a59b6f3e59e906e7b6a14375f88b6 /drivers/net/ethernet/cisco | |
parent | e52fcb2462ac484e6dd6e68869536609f0216938 (diff) |
Sweep the last of the active .get_drvinfo floors under ethernet/
This round of floor sweeping converts strncpy calls in various .get_drvinfo
routines to the preferred strlcpy. It also does a modicum of other
cleaning in those routines.
Signed-off-by: Rick Jones <rick.jones2@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cisco')
-rw-r--r-- | drivers/net/ethernet/cisco/enic/enic_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c index c3786fda11db..1fe5df0284a6 100644 --- a/drivers/net/ethernet/cisco/enic/enic_main.c +++ b/drivers/net/ethernet/cisco/enic/enic_main.c | |||
@@ -217,11 +217,11 @@ static void enic_get_drvinfo(struct net_device *netdev, | |||
217 | 217 | ||
218 | enic_dev_fw_info(enic, &fw_info); | 218 | enic_dev_fw_info(enic, &fw_info); |
219 | 219 | ||
220 | strncpy(drvinfo->driver, DRV_NAME, sizeof(drvinfo->driver)); | 220 | strlcpy(drvinfo->driver, DRV_NAME, sizeof(drvinfo->driver)); |
221 | strncpy(drvinfo->version, DRV_VERSION, sizeof(drvinfo->version)); | 221 | strlcpy(drvinfo->version, DRV_VERSION, sizeof(drvinfo->version)); |
222 | strncpy(drvinfo->fw_version, fw_info->fw_version, | 222 | strlcpy(drvinfo->fw_version, fw_info->fw_version, |
223 | sizeof(drvinfo->fw_version)); | 223 | sizeof(drvinfo->fw_version)); |
224 | strncpy(drvinfo->bus_info, pci_name(enic->pdev), | 224 | strlcpy(drvinfo->bus_info, pci_name(enic->pdev), |
225 | sizeof(drvinfo->bus_info)); | 225 | sizeof(drvinfo->bus_info)); |
226 | } | 226 | } |
227 | 227 | ||