Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[pandora-kernel.git] / drivers / net / wimax / i2400m / netdev.c

diff --git a/drivers/net/wimax/i2400m/netdev.c b/drivers/net/wimax/i2400m/netdev.c
index 530581c..4889613 100644 (file)
--- a/drivers/net/wimax/i2400m/netdev.c
+++ b/drivers/net/wimax/i2400m/netdev.c
@@ -599,12 +599,12 @@ static void i2400m_get_drvinfo(struct net_device *net_dev,
 {
        struct i2400m *i2400m = net_dev_to_i2400m(net_dev);
 
-       strncpy(info->driver, KBUILD_MODNAME, sizeof(info->driver) - 1);
-       strncpy(info->fw_version,
-               i2400m->fw_name ? : "", sizeof(info->fw_version) - 1);
+       strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
+       strlcpy(info->fw_version, i2400m->fw_name ? : "",
+               sizeof(info->fw_version));
        if (net_dev->dev.parent)
-               strncpy(info->bus_info, dev_name(net_dev->dev.parent),
-                       sizeof(info->bus_info) - 1);
+               strlcpy(info->bus_info, dev_name(net_dev->dev.parent),
+                       sizeof(info->bus_info));
 }
 
 static const struct ethtool_ops i2400m_ethtool_ops = {