From: Michael Chan <mchan@broadcom.com>
Date: Fri, 22 Apr 2005 00:12:46 +0000 (-0700)
Subject: [TG3]: Fix bug in tg3_set_eeprom()
X-Git-Tag: MMI-PSA29.97-13-9~57518
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1c8594b48b00a98d12477355e944e165a5f64cd5;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

[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>
---

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;