e1000e: use correct pointer when memcpy'ing a 2-dimensional array
authorBruce Allan <bruce.w.allan@intel.com>
Wed, 19 Jan 2011 04:23:39 +0000 (04:23 +0000)
committerJeff 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

index daa7fe4b9fdd08bd4ca2b8fd34ca18218a2b58a0..0c085992546836ce583700c052043a37a3b7157c 100644 (file)
@@ -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++) {