Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[cascardo/linux.git] / drivers / net / ethernet / toshiba / spider_net_ethtool.c

diff --git a/drivers/net/ethernet/toshiba/spider_net_ethtool.c b/drivers/net/ethernet/toshiba/spider_net_ethtool.c
index 9c288cd..ffe5193 100644 (file)
--- a/drivers/net/ethernet/toshiba/spider_net_ethtool.c
+++ b/drivers/net/ethernet/toshiba/spider_net_ethtool.c
@@ -72,11 +72,13 @@ spider_net_ethtool_get_drvinfo(struct net_device *netdev,
        card = netdev_priv(netdev);
 
        /* clear and fill out info */
-       memset(drvinfo, 0, sizeof(struct ethtool_drvinfo));
-       strncpy(drvinfo->driver, spider_net_driver_name, 32);
-       strncpy(drvinfo->version, VERSION, 32);
-       strcpy(drvinfo->fw_version, "no information");
-       strncpy(drvinfo->bus_info, pci_name(card->pdev), 32);
+       strlcpy(drvinfo->driver, spider_net_driver_name,
+               sizeof(drvinfo->driver));
+       strlcpy(drvinfo->version, VERSION, sizeof(drvinfo->version));
+       strlcpy(drvinfo->fw_version, "no information",
+               sizeof(drvinfo->fw_version));
+       strlcpy(drvinfo->bus_info, pci_name(card->pdev),
+               sizeof(drvinfo->bus_info));
 }
 
 static void