diff options
| author | Michael Chan <mchan@broadcom.com> | 2005-04-21 17:12:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2005-04-21 17:12:46 -0700 |
| commit | 1c8594b48b00a98d12477355e944e165a5f64cd5 (patch) | |
| tree | f784f244a3322b25abb7fae02cae7be20a64eb53 /drivers/net/tg3.c | |
| parent | e6af301be3c129adbc8a7c8ffb76e62533ad9575 (diff) | |
| download | lwn-1c8594b48b00a98d12477355e944e165a5f64cd5.tar.gz lwn-1c8594b48b00a98d12477355e944e165a5f64cd5.zip | |
[TG3]: Fix bug in tg3_set_eeprom()
Fix a bug in tg3_set_eeprom() when the length is less than 4 and the
offset is not 4-byte aligned.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.c')
| -rw-r--r-- | drivers/net/tg3.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 301546425736..fb3eb6f8a737 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -6560,10 +6560,12 @@ static int tg3_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom, start = cpu_to_le32(start); len += b_offset; offset &= ~3; + if (len < 4) + len = 4; } odd_len = 0; - if ((len & 3) && ((len > 4) || (b_offset == 0))) { + if (len & 3) { /* adjustments to end on required 4 byte boundary */ odd_len = 1; len = (len + 3) & ~3; |