Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[firefly-linux-kernel-4.4.55.git] / drivers / net / cris / eth_v10.c

diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c
index 021d69c5d9bc951797ede8e72dde15bad706613b..29e272cc7a984f79cc3d6815b76deacb18b70abb 100644 (file)
--- a/drivers/net/cris/eth_v10.c
+++ b/drivers/net/cris/eth_v10.c
@@ -1448,10 +1448,10 @@ static int e100_set_settings(struct net_device *dev,
 static void e100_get_drvinfo(struct net_device *dev,
                             struct ethtool_drvinfo *info)
 {
-       strncpy(info->driver, "ETRAX 100LX", sizeof(info->driver) - 1);
-       strncpy(info->version, "$Revision: 1.31 $", sizeof(info->version) - 1);
-       strncpy(info->fw_version, "N/A", sizeof(info->fw_version) - 1);
-       strncpy(info->bus_info, "N/A", sizeof(info->bus_info) - 1);
+       strlcpy(info->driver, "ETRAX 100LX", sizeof(info->driver));
+       strlcpy(info->version, "$Revision: 1.31 $", sizeof(info->version));
+       strlcpy(info->fw_version, "N/A", sizeof(info->fw_version));
+       strlcpy(info->bus_info, "N/A", sizeof(info->bus_info));
 }
 
 static int e100_nway_reset(struct net_device *dev)