aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
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/xilinx/xilinx_axienet_main.c
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/xilinx/xilinx_axienet_main.c')
-rw-r--r--drivers/net/ethernet/xilinx/xilinx_axienet_main.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index d9f69b82cc4f..d3b3571b6013 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -1124,9 +1124,8 @@ static int axienet_ethtools_set_settings(struct net_device *ndev,
1124static void axienet_ethtools_get_drvinfo(struct net_device *ndev, 1124static void axienet_ethtools_get_drvinfo(struct net_device *ndev,
1125 struct ethtool_drvinfo *ed) 1125 struct ethtool_drvinfo *ed)
1126{ 1126{
1127 memset(ed, 0, sizeof(struct ethtool_drvinfo)); 1127 strlcpy(ed->driver, DRIVER_NAME, sizeof(ed->driver));
1128 strcpy(ed->driver, DRIVER_NAME); 1128 strlcpy(ed->version, DRIVER_VERSION, sizeof(ed->version));
1129 strcpy(ed->version, DRIVER_VERSION);
1130 ed->regdump_len = sizeof(u32) * AXIENET_REGS_N; 1129 ed->regdump_len = sizeof(u32) * AXIENET_REGS_N;
1131} 1130}
1132 1131