diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 08:59:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 08:59:45 -0400 |
| commit | d59bf96cdde5b874a57bfd1425faa45da915d0b7 (patch) | |
| tree | 351a40b72514d620e5bebea2de38c26f23277ffc /drivers/net/sis900.h | |
| parent | 28df955a2ad484d602314b30183ea8496a9aa34a (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/net/sis900.h')
| -rw-r--r-- | drivers/net/sis900.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/sis900.h b/drivers/net/sis900.h index 50323941e3c0..4834e3a15694 100644 --- a/drivers/net/sis900.h +++ b/drivers/net/sis900.h | |||
| @@ -310,8 +310,14 @@ enum sis630_revision_id { | |||
| 310 | #define CRC_SIZE 4 | 310 | #define CRC_SIZE 4 |
| 311 | #define MAC_HEADER_SIZE 14 | 311 | #define MAC_HEADER_SIZE 14 |
| 312 | 312 | ||
| 313 | #define TX_BUF_SIZE 1536 | 313 | #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) |
| 314 | #define RX_BUF_SIZE 1536 | 314 | #define MAX_FRAME_SIZE (1518 + 4) |
| 315 | #else | ||
| 316 | #define MAX_FRAME_SIZE 1518 | ||
| 317 | #endif /* CONFIG_VLAN_802_1Q */ | ||
| 318 | |||
| 319 | #define TX_BUF_SIZE (MAX_FRAME_SIZE+18) | ||
| 320 | #define RX_BUF_SIZE (MAX_FRAME_SIZE+18) | ||
| 315 | 321 | ||
| 316 | #define NUM_TX_DESC 16 /* Number of Tx descriptor registers. */ | 322 | #define NUM_TX_DESC 16 /* Number of Tx descriptor registers. */ |
| 317 | #define NUM_RX_DESC 16 /* Number of Rx descriptor registers. */ | 323 | #define NUM_RX_DESC 16 /* Number of Rx descriptor registers. */ |