From 1a1bf71eed409cc2b7a0d64c5e6d8fdc25eeb7df Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Mon, 2 Jul 2012 21:36:59 +0100
Subject: [PATCH] --- yaml --- r: 315444 b: refs/heads/master c:
 a4ed2d4cd96dd71b0f2e04a88f83abcab6ddd023 h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/net/ethernet/sfc/ethtool.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ecb8000913fb..c7ecfd711265 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7cbb163d980fc79f47a3cba63dd130b1d655d1d
+refs/heads/master: a4ed2d4cd96dd71b0f2e04a88f83abcab6ddd023
diff --git a/trunk/drivers/net/ethernet/sfc/ethtool.c b/trunk/drivers/net/ethernet/sfc/ethtool.c
index 03ded364c8da..10536f93b561 100644
--- a/trunk/drivers/net/ethernet/sfc/ethtool.c
+++ b/trunk/drivers/net/ethernet/sfc/ethtool.c
@@ -453,7 +453,7 @@ static void efx_ethtool_get_strings(struct net_device *net_dev,
 	switch (string_set) {
 	case ETH_SS_STATS:
 		for (i = 0; i < EFX_ETHTOOL_NUM_STATS; i++)
-			strncpy(ethtool_strings[i].name,
+			strlcpy(ethtool_strings[i].name,
 				efx_ethtool_stats[i].name,
 				sizeof(ethtool_strings[i].name));
 		break;