From 024f4d88b45003710e8e2ee937b0c56aaf2dff2d Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Mon, 23 Jun 2008 14:35:16 +0300 Subject: ipg: always compile in jumbo frame support Add a ->is_jumbo boolean to struct ipg_nic_private and fix up ipg_interrupt_handler() to call the jumbo frame version of ipg_nic_rx() if the boolean is set to true. Also remove the JUMBO_FRAME #ifdefs so we can always compile in support for jumbo frames. Tested-by: Andrew Savchenko Signed-off-by: Pekka Enberg Signed-off-by: Jeff Garzik --- drivers/net/ipg.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'drivers/net/ipg.h') diff --git a/drivers/net/ipg.h b/drivers/net/ipg.h index cda53887d4db..446f3663ae6a 100644 --- a/drivers/net/ipg.h +++ b/drivers/net/ipg.h @@ -536,6 +536,12 @@ enum ipg_regs { */ #define IPG_FRAMESBETWEENTXDMACOMPLETES 0x1 +#ifdef JUMBO_FRAME +# define IPG_JUMBO true +#else +# define IPG_JUMBO false +#endif + #ifdef JUMBO_FRAME # ifdef JUMBO_FRAME_SIZE_2K @@ -786,9 +792,8 @@ struct ipg_nic_private { unsigned int tx_dirty; unsigned int rx_current; unsigned int rx_dirty; -#ifdef JUMBO_FRAME + bool is_jumbo; struct ipg_jumbo jumbo; -#endif unsigned int rx_buf_sz; struct pci_dev *pdev; struct net_device *dev; -- cgit v1.2.2