diff options
| author | Alex Elder <elder@ieee.org> | 2009-09-10 14:33:56 -0500 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2009-09-10 14:33:56 -0500 |
| commit | a4872d5b6ad69a49975c0268828b5bb2317ea5a0 (patch) | |
| tree | f79577c2731753efb621ef62774949c1e0acdaad /drivers/net/atl1c/atl1c_ethtool.c | |
| parent | 4734d401d43c6469d568caf223d37aa0fc1bf4dc (diff) | |
| parent | 74fca6a42863ffacaf7ba6f1936a9f228950f657 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/atl1c/atl1c_ethtool.c')
| -rw-r--r-- | drivers/net/atl1c/atl1c_ethtool.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/atl1c/atl1c_ethtool.c b/drivers/net/atl1c/atl1c_ethtool.c index 607007d75b6..00d11b480af 100644 --- a/drivers/net/atl1c/atl1c_ethtool.c +++ b/drivers/net/atl1c/atl1c_ethtool.c @@ -232,11 +232,11 @@ static void atl1c_get_drvinfo(struct net_device *netdev, { struct atl1c_adapter *adapter = netdev_priv(netdev); - strncpy(drvinfo->driver, atl1c_driver_name, sizeof(drvinfo->driver)); - strncpy(drvinfo->version, atl1c_driver_version, + strlcpy(drvinfo->driver, atl1c_driver_name, sizeof(drvinfo->driver)); + strlcpy(drvinfo->version, atl1c_driver_version, sizeof(drvinfo->version)); - strncpy(drvinfo->fw_version, "N/A", sizeof(drvinfo->fw_version)); - strncpy(drvinfo->bus_info, pci_name(adapter->pdev), + strlcpy(drvinfo->fw_version, "N/A", sizeof(drvinfo->fw_version)); + strlcpy(drvinfo->bus_info, pci_name(adapter->pdev), sizeof(drvinfo->bus_info)); drvinfo->n_stats = 0; drvinfo->testinfo_len = 0; |