Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / drivers / net / ethernet / qualcomm / emac / emac-ethtool.c

diff --git a/drivers/net/ethernet/qualcomm/emac/emac-ethtool.c b/drivers/net/ethernet/qualcomm/emac/emac-ethtool.c
index 79e5007..f72e13b 100644 (file)
--- a/drivers/net/ethernet/qualcomm/emac/emac-ethtool.c
+++ b/drivers/net/ethernet/qualcomm/emac/emac-ethtool.c
@@ -100,7 +100,7 @@ static void emac_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
 
        case ETH_SS_STATS:
                for (i = 0; i < EMAC_STATS_LEN; i++) {
-                       strlcpy(data, emac_ethtool_stat_strings[i],
+                       strscpy(data, emac_ethtool_stat_strings[i],
                                ETH_GSTRING_LEN);
                        data += ETH_GSTRING_LEN;
                }