Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / net / wireless / ethtool.c

diff --git a/net/wireless/ethtool.c b/net/wireless/ethtool.c
index 48c48ffafa1db51d9b96ea2d5a418e592dbcf436..e37862f1b1270d8e2056fb6289f01bf69b583720 100644 (file)
--- a/net/wireless/ethtool.c
+++ b/net/wireless/ethtool.c
@@ -15,10 +15,10 @@ static void cfg80211_get_drvinfo(struct net_device *dev,
        strlcpy(info->version, init_utsname()->release, sizeof(info->version));
 
        if (wdev->wiphy->fw_version[0])
-               strncpy(info->fw_version, wdev->wiphy->fw_version,
+               strlcpy(info->fw_version, wdev->wiphy->fw_version,
                        sizeof(info->fw_version));
        else
-               strncpy(info->fw_version, "N/A", sizeof(info->fw_version));
+               strlcpy(info->fw_version, "N/A", sizeof(info->fw_version));
 
        strlcpy(info->bus_info, dev_name(wiphy_dev(wdev->wiphy)),
                sizeof(info->bus_info));