aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ipg.c
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2008-06-23 07:35:37 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-07-04 08:46:51 -0400
commit83042955210aaee70b881240fe4f5e8409235308 (patch)
tree2e8a6ba7f7662376a11ca922e022ef9e3aa003fe /drivers/net/ipg.c
parent024f4d88b45003710e8e2ee937b0c56aaf2dff2d (diff)
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>
Diffstat (limited to 'drivers/net/ipg.c')
-rw-r--r--drivers/net/ipg.c6
1 files changed, 3 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) &