From 43f23bffd681420c0c06bba48771718d5fcf43bc Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Wed, 16 Apr 2008 20:37:24 -0400 Subject: [PATCH] --- yaml --- r: 90862 b: refs/heads/master c: 48dd59e398455b58910910bc272e0da85f11bd98 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/tulip/winbond-840.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8d8211c6ac97..0a3faf13b16e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dc13b385999f163dc30c73d66f2ac6d67410528d +refs/heads/master: 48dd59e398455b58910910bc272e0da85f11bd98 diff --git a/trunk/drivers/net/tulip/winbond-840.c b/trunk/drivers/net/tulip/winbond-840.c index 35d0cfcf8c47..50068194c163 100644 --- a/trunk/drivers/net/tulip/winbond-840.c +++ b/trunk/drivers/net/tulip/winbond-840.c @@ -107,8 +107,6 @@ static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; /* Time in jiffies before concluding the transmitter is hung. */ #define TX_TIMEOUT (2*HZ) -#define PKT_BUF_SZ 1536 /* Size of each temporary Rx buffer.*/ - /* Include files, designed to support most kernel versions 2.0.0 and later. */ #include #include @@ -137,6 +135,9 @@ static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; #include "tulip.h" +#undef PKT_BUF_SZ /* tulip.h also defines this */ +#define PKT_BUF_SZ 1536 /* Size of each temporary Rx buffer.*/ + /* These identify the driver base version and may not be removed. */ static char version[] = KERN_INFO DRV_NAME ".c:v" DRV_VERSION " (2.4 port) " DRV_RELDATE " Donald Becker \n"