summaryrefslogtreecommitdiffstats
path: root/drivers/net/ipg.h
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2008-06-23 14:35:16 +0300
committerJeff Garzik <jgarzik@redhat.com>2008-07-04 08:46:51 -0400
commit024f4d88b45003710e8e2ee937b0c56aaf2dff2d (patch)
tree3cbf3080f10e5bd3b1017c68581e3a48b8ff3b2c /drivers/net/ipg.h
parent16e605a2a0398bc1e693e8571bf0cbc5aa5c00c8 (diff)
downloadlinux-024f4d88b45003710e8e2ee937b0c56aaf2dff2d.tar.bz2
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 <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.h')
-rw-r--r--drivers/net/ipg.h9
1 files changed, 7 insertions, 2 deletions
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
@@ -537,6 +537,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
# define JUMBO_FRAME_SIZE 2048
@@ -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;