projects/linux·commit 1c8594b4

[TG3]: Fix bug in tg3_set_eeprom()

1c8594b4 · Michael Chan <[email protected]> · 2005-04-21 17:12:46 -07:00

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 <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Commit
1c8594b48b00a98d12477355e944e165a5f64cd5
Parents
e6af301b

Changes

1 files changed · +3 −1

FileStatusAddDelContent
drivers/net/tg3.cmodified+3−1View file

drivers/net/tg3.c

View file
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 3015464..fb3eb6f 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;