diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/net/tg3.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/net/tg3.c')
| -rw-r--r-- | drivers/net/tg3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 73c942d85f07..b8c5f35577e4 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
| @@ -9712,7 +9712,7 @@ static int tg3_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom, | |||
| 9712 | eeprom->len += b_count; | 9712 | eeprom->len += b_count; |
| 9713 | } | 9713 | } |
| 9714 | 9714 | ||
| 9715 | /* read bytes upto the last 4 byte boundary */ | 9715 | /* read bytes up to the last 4 byte boundary */ |
| 9716 | pd = &data[eeprom->len]; | 9716 | pd = &data[eeprom->len]; |
| 9717 | for (i = 0; i < (len - (len & 3)); i += 4) { | 9717 | for (i = 0; i < (len - (len & 3)); i += 4) { |
| 9718 | ret = tg3_nvram_read_be32(tp, offset + i, &val); | 9718 | ret = tg3_nvram_read_be32(tp, offset + i, &val); |