aboutsummaryrefslogtreecommitdiffstats
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 af7499445bb1..40ce90dedb02 100644
--- a/drivers/net/ipg.c
+++ b/drivers/net/ipg.c
@@ -1807,9 +1807,9 @@ static int ipg_nic_open(struct net_device *dev)
1807 sp->jumbo.found_start = 0; 1807 sp->jumbo.found_start = 0;
1808 sp->jumbo.current_size = 0; 1808 sp->jumbo.current_size = 0;
1809 sp->jumbo.skb = NULL; 1809 sp->jumbo.skb = NULL;
1810#ifdef JUMBO_FRAME 1810
1811 dev->mtu = IPG_TXFRAG_SIZE; 1811 if (IPG_TXFRAG_SIZE)
1812#endif 1812 dev->mtu = IPG_TXFRAG_SIZE;
1813 1813
1814 /* Enable transmit and receive operation of the IPG. */ 1814 /* Enable transmit and receive operation of the IPG. */
1815 ipg_w32((ipg_r32(MAC_CTRL) | IPG_MC_RX_ENABLE | IPG_MC_TX_ENABLE) & 1815 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 446f3663ae6a..9c520ce264a6 100644
--- a/drivers/net/ipg.h
+++ b/drivers/net/ipg.h
@@ -598,6 +598,8 @@ enum ipg_regs {
598#ifdef JUMBO_FRAME 598#ifdef JUMBO_FRAME
599/* IPG_TXFRAG_SIZE must <= 0x2b00, or TX will crash */ 599/* IPG_TXFRAG_SIZE must <= 0x2b00, or TX will crash */
600#define IPG_TXFRAG_SIZE JUMBO_FRAME_SIZE 600#define IPG_TXFRAG_SIZE JUMBO_FRAME_SIZE
601#else
602#define IPG_TXFRAG_SIZE 0 /* use default MTU */
601#endif 603#endif
602 604
603/* Size of allocated received buffers. Nominally 0x0600. 605/* Size of allocated received buffers. Nominally 0x0600.