[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>
This commit is contained in:
parent
e6af301be3
commit
1c8594b48b
|
@ -6560,10 +6560,12 @@ static int tg3_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
|
||||||
start = cpu_to_le32(start);
|
start = cpu_to_le32(start);
|
||||||
len += b_offset;
|
len += b_offset;
|
||||||
offset &= ~3;
|
offset &= ~3;
|
||||||
|
if (len < 4)
|
||||||
|
len = 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
odd_len = 0;
|
odd_len = 0;
|
||||||
if ((len & 3) && ((len > 4) || (b_offset == 0))) {
|
if (len & 3) {
|
||||||
/* adjustments to end on required 4 byte boundary */
|
/* adjustments to end on required 4 byte boundary */
|
||||||
odd_len = 1;
|
odd_len = 1;
|
||||||
len = (len + 3) & ~3;
|
len = (len + 3) & ~3;
|
||||||
|
|
Loading…
Reference in a new issue