From aa614ad0906d3ccedabe4009738a29b0e7b69628 Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Mon, 23 Jun 2008 14:35:37 +0300
Subject: [PATCH] --- yaml --- r: 103232 b: refs/heads/master c:
 83042955210aaee70b881240fe4f5e8409235308 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0cffe8d30a73..71e159ceeb95 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 024f4d88b45003710e8e2ee937b0c56aaf2dff2d
+refs/heads/master: 83042955210aaee70b881240fe4f5e8409235308
diff --git a/trunk/drivers/net/ipg.c b/trunk/drivers/net/ipg.c
index af7499445bb1..40ce90dedb02 100644
--- a/trunk/drivers/net/ipg.c
+++ b/trunk/drivers/net/ipg.c
@@ -1807,9 +1807,9 @@ static int ipg_nic_open(struct net_device *dev)
 	sp->jumbo.found_start = 0;
 	sp->jumbo.current_size = 0;
 	sp->jumbo.skb = NULL;
-#ifdef JUMBO_FRAME
-	dev->mtu = IPG_TXFRAG_SIZE;
-#endif
+
+	if (IPG_TXFRAG_SIZE)
+		dev->mtu = IPG_TXFRAG_SIZE;
 
 	/* Enable transmit and receive operation of the IPG. */
 	ipg_w32((ipg_r32(MAC_CTRL) | IPG_MC_RX_ENABLE | IPG_MC_TX_ENABLE) &
diff --git a/trunk/drivers/net/ipg.h b/trunk/drivers/net/ipg.h
index 446f3663ae6a..9c520ce264a6 100644
--- a/trunk/drivers/net/ipg.h
+++ b/trunk/drivers/net/ipg.h
@@ -598,6 +598,8 @@ enum ipg_regs {
 #ifdef JUMBO_FRAME
 /* IPG_TXFRAG_SIZE must <= 0x2b00, or TX will crash */
 #define		IPG_TXFRAG_SIZE		JUMBO_FRAME_SIZE
+#else
+#define		IPG_TXFRAG_SIZE		0 /* use default MTU */
 #endif
 
 /* Size of allocated received buffers. Nominally 0x0600.