---

yaml --- r: 184113 b: refs/heads/master c: 38a8fc0 h: refs/heads/master i: 184111: ed75904 v: v3
git-mirror · Feb 16, 2010 · f4200f4 · f4200f4
1 parent 5c14ff9
commit f4200f4
Show file tree

Hide file tree

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