From 7f8ab724a29d2f386993f206e8f00ea0567a5741 Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@broadcom.com>
Date: Thu, 21 Apr 2005 17:12:46 -0700
Subject: [PATCH] --- yaml --- r: 375 b: refs/heads/master c:
 1c8594b48b00a98d12477355e944e165a5f64cd5 h: refs/heads/master i:   373:
 df26221ca380efba873c68f36afa5e7dab49eca4   371:
 8e003e3bfbc65c0f0bff97923ad04c54316e1a93   367:
 eb4ccc22db9edfe2603b51ad9f3f91942b335e12 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/tg3.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c227c21d5edb..f4e0239a0453 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6af301be3c129adbc8a7c8ffb76e62533ad9575
+refs/heads/master: 1c8594b48b00a98d12477355e944e165a5f64cd5
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index 301546425736..fb3eb6f8a737 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/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;