ipg: remove jumbo frame #ifdef from mtu
Remove JUMBO_FRAME #ifdef from dev->mtu setting in ipg_nic_open() so that we
can make IPG_TXFRAG_SIZE configurable.
Tested-by: Andrew Savchenko <Bircoph@list.ru>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
diff --git a/drivers/net/ipg.c b/drivers/net/ipg.c
index af74994..40ce90d 100644
--- a/drivers/net/ipg.c
+++ b/drivers/net/ipg.c
@@ -1807,9 +1807,9 @@
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 446f366..9c520ce 100644
--- a/drivers/net/ipg.h
+++ b/drivers/net/ipg.h
@@ -598,6 +598,8 @@
#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.