From f4200f44a825f0b9dbfe60982f4597cba6006d5d Mon Sep 17 00:00:00 2001
From: Divy Le Ray <divy@chelsio.com>
Date: Sat, 13 Feb 2010 09:44:30 +0000
Subject: [PATCH] --- yaml --- r: 184113 b: refs/heads/master c:
 38a8fc0fcf86f131f8bddf3787f9dfa7325bd981 h: refs/heads/master i:   184111:
 ed7590408c276624fc36e23ce5ca43121bf39adc v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/net/cxgb3/xgmac.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9ffce2d209c7..4dc1bd9fb05c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d41a5b7da223f7a80844fb3e948e8d5e6181f214
+refs/heads/master: 38a8fc0fcf86f131f8bddf3787f9dfa7325bd981
diff --git a/trunk/drivers/net/cxgb3/xgmac.c b/trunk/drivers/net/cxgb3/xgmac.c
index 0109ee4f2f91..0c08de5d09fd 100644
--- a/trunk/drivers/net/cxgb3/xgmac.c
+++ b/trunk/drivers/net/cxgb3/xgmac.c
@@ -353,6 +353,9 @@ int t3_mac_set_mtu(struct cmac *mac, unsigned int mtu)
 	 * packet size register includes header, but not FCS.
 	 */
 	mtu += 14;
+	if (mtu > 1536)
+		mtu += 4;
+
 	if (mtu > MAX_FRAME_SIZE - 4)
 		return -EINVAL;
 	t3_write_reg(adap, A_XGM_RX_MAX_PKT_SIZE + mac->offset, mtu);