---

yaml --- r: 375 b: refs/heads/master c: 1c8594b h: refs/heads/master i: 373: df26221 371: 8e003e3 367: eb4ccc2 v: v3
git-mirror · Apr 22, 2005 · 7f8ab72 · 7f8ab72
1 parent 2c98168
commit 7f8ab72
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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;