From: Bruce Allan <bruce.w.allan@intel.com>
Date: Wed, 19 Jan 2011 04:23:39 +0000 (+0000)
Subject: e1000e: use correct pointer when memcpy'ing a 2-dimensional array
X-Git-Tag: MMI-PSA29.97-13-9~20520^2~389^2~13
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5c1bda0aa32e4614c32a45ce5662ed6914bae38a;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

e1000e: use correct pointer when memcpy'ing a 2-dimensional array

*e1000_gstrings_test is not the same size as e1000_gstrings_test.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---

diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index daa7fe4b9fdd..0c0859925468 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
@@ -2006,7 +2006,7 @@ static void e1000_get_strings(struct net_device *netdev, u32 stringset,
 
 	switch (stringset) {
 	case ETH_SS_TEST:
-		memcpy(data, *e1000_gstrings_test, sizeof(e1000_gstrings_test));
+		memcpy(data, e1000_gstrings_test, sizeof(e1000_gstrings_test));
 		break;
 	case ETH_SS_STATS:
 		for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {