OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
79f5e84
)
e1000e: use correct pointer when memcpy'ing a 2-dimensional array
author
Bruce Allan
<bruce.w.allan@intel.com>
Wed, 19 Jan 2011 04:23:39 +0000
(
04:23
+0000)
committer
Jeff Kirsher
<jeffrey.t.kirsher@intel.com>
Fri, 11 Feb 2011 16:34:45 +0000
(08:34 -0800)
*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>
drivers/net/e1000e/ethtool.c
patch
|
blob
|
history
diff --git
a/drivers/net/e1000e/ethtool.c
b/drivers/net/e1000e/ethtool.c
index
daa7fe4
..
0c08599
100644
(file)
--- 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++) {