diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-14 22:30:17 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-14 22:30:17 -0700 |
| commit | 925068dcdc746236264d1877d3d5df656e87882a (patch) | |
| tree | dc7615e1e87a1ca26ee31510c240a1c85fb6f1ad /drivers/net/gianfar.h | |
| parent | 83aa2e964b9b04effa304aaf3c1090b46812a04b (diff) | |
| parent | 67fbbe1551b24d1bcab8478407f9b8c713d5596e (diff) | |
Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/gianfar.h')
| -rw-r--r-- | drivers/net/gianfar.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h index 27f37c81e52..bead71cb2b1 100644 --- a/drivers/net/gianfar.h +++ b/drivers/net/gianfar.h @@ -77,13 +77,8 @@ extern const char gfar_driver_name[]; extern const char gfar_driver_version[]; /* These need to be powers of 2 for this driver */ -#ifdef CONFIG_GFAR_NAPI #define DEFAULT_TX_RING_SIZE 256 #define DEFAULT_RX_RING_SIZE 256 -#else -#define DEFAULT_TX_RING_SIZE 64 -#define DEFAULT_RX_RING_SIZE 64 -#endif #define GFAR_RX_MAX_RING_SIZE 256 #define GFAR_TX_MAX_RING_SIZE 256 @@ -128,14 +123,8 @@ extern const char gfar_driver_version[]; #define DEFAULT_RXTIME 21 -/* Non NAPI Case */ -#ifndef CONFIG_GFAR_NAPI -#define DEFAULT_RX_COALESCE 1 -#define DEFAULT_RXCOUNT 16 -#else #define DEFAULT_RX_COALESCE 0 #define DEFAULT_RXCOUNT 0 -#endif /* CONFIG_GFAR_NAPI */ #define MIIMCFG_INIT_VALUE 0x00000007 #define MIIMCFG_RESET 0x80000000 |