diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2006-08-16 02:37:01 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2006-08-16 02:37:01 +0000 |
| commit | 65bc33032d45046943c4d18a409e2c0e7d02b696 (patch) | |
| tree | 24fc45c084333c463e69ca8c0a2e5129d4217f61 /sys/dev/pci | |
| parent | 5d9497cb744b444f57512dbcb9e5cea3c732b27b (diff) | |
remove the sparc64 workarounds for the jumbo frame receive ring sizes now
that the iommu code has been fixed.
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/if_bgereg.h | 6 | ||||
| -rw-r--r-- | sys/dev/pci/if_skreg.h | 8 | ||||
| -rw-r--r-- | sys/dev/pci/if_tireg.h | 6 |
3 files changed, 4 insertions, 16 deletions
diff --git a/sys/dev/pci/if_bgereg.h b/sys/dev/pci/if_bgereg.h index fd13e032459..39bf3e7b978 100644 --- a/sys/dev/pci/if_bgereg.h +++ b/sys/dev/pci/if_bgereg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bgereg.h,v 1.51 2006/07/18 01:24:46 brad Exp $ */ +/* $OpenBSD: if_bgereg.h,v 1.52 2006/08/16 02:37:00 brad Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -2243,11 +2243,7 @@ struct bge_gib { #define BGE_SSLOTS 256 #define BGE_MSLOTS 256 -#ifdef __sparc64__ -#define BGE_JSLOTS 57 -#else #define BGE_JSLOTS 384 -#endif #define BGE_JRAWLEN (BGE_JUMBO_FRAMELEN + ETHER_ALIGN) #define BGE_JLEN (BGE_JRAWLEN + (sizeof(u_int64_t) - \ diff --git a/sys/dev/pci/if_skreg.h b/sys/dev/pci/if_skreg.h index dfb9f11930f..554ee51e3a5 100644 --- a/sys/dev/pci/if_skreg.h +++ b/sys/dev/pci/if_skreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_skreg.h,v 1.35 2006/07/30 22:58:38 brad Exp $ */ +/* $OpenBSD: if_skreg.h,v 1.36 2006/08/16 02:37:00 brad Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -1472,11 +1472,7 @@ struct sk_tx_desc { #define SK_TXBYTES SK_RXBYTES #define SK_TX_RING_CNT 512 -#ifdef __sparc64__ -#define SK_RX_RING_CNT 39 -#else #define SK_RX_RING_CNT 256 -#endif /* * Jumbo buffer stuff. Note that we must allocate more jumbo @@ -1489,7 +1485,7 @@ struct sk_tx_desc { #define SK_JUMBO_FRAMELEN 9018 #define SK_JUMBO_MTU (SK_JUMBO_FRAMELEN - ETHER_HDR_LEN - ETHER_CRC_LEN) #define SK_MIN_FRAMELEN (ETHER_MIN_LEN - ETHER_CRC_LEN) -#define SK_JSLOTS ((SK_RX_RING_CNT / 2) * 3) +#define SK_JSLOTS 384 #define SK_JRAWLEN (SK_JUMBO_FRAMELEN + ETHER_ALIGN) #define SK_JLEN SK_JRAWLEN diff --git a/sys/dev/pci/if_tireg.h b/sys/dev/pci/if_tireg.h index 78198e01cf9..c76b1a99fb0 100644 --- a/sys/dev/pci/if_tireg.h +++ b/sys/dev/pci/if_tireg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tireg.h,v 1.24 2006/07/18 01:24:46 brad Exp $ */ +/* $OpenBSD: if_tireg.h,v 1.25 2006/08/16 02:37:00 brad Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -991,11 +991,7 @@ struct ti_event_desc { #define TI_SSLOTS 256 #define TI_MSLOTS 256 -#ifdef __sparc64__ -#define TI_JSLOTS 57 -#else #define TI_JSLOTS 384 -#endif #define TI_JRAWLEN (TI_JUMBO_FRAMELEN + ETHER_ALIGN) #define TI_JLEN (TI_JRAWLEN + (sizeof(u_int64_t) - \ |