diff options
| author |   Roel Kluin <12o3l@tiscali.nl> | 2007-12-05 11:57:30 -0800 |
|---|---|---|
| committer |   Jeff Garzik <jeff@garzik.org> | 2007-12-07 15:01:43 -0500 |
| commit | c32bc6e9b0778c891f7f3b97cd05c8cdf98b6721 (patch) | |
| tree | c65214a5e8cedacf517d9337fa100ec0810e4d7a /drivers/net/e1000e/ethtool.c | |
| parent | make bnx2x select ZLIB_INFLATE (diff) | |
| download | linux-dev-c32bc6e9b0778c891f7f3b97cd05c8cdf98b6721.tar.xz linux-dev-c32bc6e9b0778c891f7f3b97cd05c8cdf98b6721.zip | |
e1000: fix memcpy in e1000_get_strings
drivers/net/e1000/e1000_ethtool.c:113:
#define E1000_TEST_LEN sizeof(e1000_gstrings_test) / ETH_GSTRING_LEN
drivers/net/e1000e/ethtool.c:106:
#define E1000_TEST_LEN sizeof(e1000_gstrings_test) / ETH_GSTRING_LEN
E1000_TEST_LEN*ETH_GSTRING_LEN will expand to
sizeof(e1000_gstrings_test) / (ETH_GSTRING_LEN * ETH_GSTRING_LEN)
A lack of parentheses around defines causes unexpected results due to
operator precedences.
Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to '')
| -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 6a39784e7ee2..87f9da1b6b4e 100644 --- a/drivers/net/e1000e/ethtool.c +++ b/drivers/net/e1000e/ethtool.c @@ -1739,7 +1739,7 @@ static void e1000_get_strings(struct net_device *netdev, u32 stringset, switch (stringset) { case ETH_SS_TEST: memcpy(data, *e1000_gstrings_test, - E1000_TEST_LEN*ETH_GSTRING_LEN); + sizeof(e1000_gstrings_test)); break; case ETH_SS_STATS: for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) { |