aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/octeon
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2013-01-05 19:44:26 -0500
committerDavid S. Miller <davem@davemloft.net>2013-01-07 00:06:31 -0500
commit7826d43f2db45c9305a6e0ba165650e1a203f517 (patch)
treea8659c995a37f58db809da9537aafac178431f31 /drivers/net/ethernet/octeon
parent2afb9b533423a9b97f84181e773cf9361d98fed6 (diff)
ethtool: fix drvinfo strings set in drivers
Use strlcpy where possible to ensure the string is \0 terminated. Use always sizeof(string) instead of 32, ETHTOOL_BUSINFO_LEN and custom defines. Use snprintf instead of sprint. Remove unnecessary inits of ->fw_version Remove unnecessary inits of drvinfo struct. Signed-off-by: Jiri Pirko <jiri@resnulli.us> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/octeon')
-rw-r--r--drivers/net/ethernet/octeon/octeon_mgmt.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/octeon/octeon_mgmt.c b/drivers/net/ethernet/octeon/octeon_mgmt.c
index b4a842c3b5c4..921729f9c85c 100644
--- a/drivers/net/ethernet/octeon/octeon_mgmt.c
+++ b/drivers/net/ethernet/octeon/octeon_mgmt.c
@@ -1350,10 +1350,10 @@ static void octeon_mgmt_poll_controller(struct net_device *netdev)
1350static void octeon_mgmt_get_drvinfo(struct net_device *netdev, 1350static void octeon_mgmt_get_drvinfo(struct net_device *netdev,
1351 struct ethtool_drvinfo *info) 1351 struct ethtool_drvinfo *info)
1352{ 1352{
1353 strncpy(info->driver, DRV_NAME, sizeof(info->driver)); 1353 strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
1354 strncpy(info->version, DRV_VERSION, sizeof(info->version)); 1354 strlcpy(info->version, DRV_VERSION, sizeof(info->version));
1355 strncpy(info->fw_version, "N/A", sizeof(info->fw_version)); 1355 strlcpy(info->fw_version, "N/A", sizeof(info->fw_version));
1356 strncpy(info->bus_info, "N/A", sizeof(info->bus_info)); 1356 strlcpy(info->bus_info, "N/A", sizeof(info->bus_info));
1357 info->n_stats = 0; 1357 info->n_stats = 0;
1358 info->testinfo_len = 0; 1358 info->testinfo_len = 0;
1359 info->regdump_len = 0; 1359 info->regdump_len = 0;