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 @@
 		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;