aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ipg.c6
-rw-r--r--drivers/net/ipg.h2
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/ipg.c b/drivers/net/ipg.c
index af7499445bb..40ce90dedb0 100644
--- a/drivers/net/ipg.c
+++ b/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/drivers/net/ipg.h b/drivers/net/ipg.h
index 446f3663ae6..9c520ce264a 100644
--- a/drivers/net/ipg.h
+++ b/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.