diff options
| author | Bruce Allan <bruce.w.allan@intel.com> | 2011-01-19 04:23:39 +0000 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-02-11 08:34:45 -0800 |
| commit | 5c1bda0aa32e4614c32a45ce5662ed6914bae38a (patch) | |
| tree | 381eadf748b7cd0b9c7ba7e1542b522bbfac0c1b /drivers/net/e1000e | |
| parent | 79f5e840143703b258717aab12647018320f4a5f (diff) | |
| download | blackbird-op-linux-5c1bda0aa32e4614c32a45ce5662ed6914bae38a.tar.gz blackbird-op-linux-5c1bda0aa32e4614c32a45ce5662ed6914bae38a.zip | |
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>
Diffstat (limited to 'drivers/net/e1000e')
| -rw-r--r-- | drivers/net/e1000e/ethtool.c | 2 |
1 files changed, 1 insertions, 1 deletions
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++) { |
