diff options
| author | Pekka Enberg <penberg@cs.helsinki.fi> | 2008-06-23 14:35:37 +0300 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-07-04 08:46:51 -0400 |
| commit | 83042955210aaee70b881240fe4f5e8409235308 (patch) | |
| tree | 2e8a6ba7f7662376a11ca922e022ef9e3aa003fe | |
| parent | 024f4d88b45003710e8e2ee937b0c56aaf2dff2d (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>
| -rw-r--r-- | drivers/net/ipg.c | 6 | ||||
| -rw-r--r-- | drivers/net/ipg.h | 2 |
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. |