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

[linux-2.6-microblaze.git] / drivers / net / wireless / brcm80211 / brcmfmac / dhd_linux.c

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index 6e3846c..c06cea8 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -413,9 +413,11 @@ static void brcmf_ethtool_get_drvinfo(struct net_device *ndev,
        struct brcmf_if *ifp = netdev_priv(ndev);
        struct brcmf_pub *drvr = ifp->drvr;
 
-       sprintf(info->driver, KBUILD_MODNAME);
-       sprintf(info->version, "%lu", drvr->drv_version);
-       sprintf(info->bus_info, "%s", dev_name(drvr->bus_if->dev));
+       strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
+       snprintf(info->version, sizeof(info->version), "%lu",
+                drvr->drv_version);
+       strlcpy(info->bus_info, dev_name(drvr->bus_if->dev),
+               sizeof(info->bus_info));
 }
 
 static const struct ethtool_ops brcmf_ethtool_ops = {