diff options
| author | Jason Wright <jason@cvs.openbsd.org> | 1998-11-11 05:24:15 +0000 |
|---|---|---|
| committer | Jason Wright <jason@cvs.openbsd.org> | 1998-11-11 05:24:15 +0000 |
| commit | a7f86dd7954fea55be4fdc5f743dfb618e09cd96 (patch) | |
| tree | 1ab02b432b47c9c8280737fefcb8dfae7a7b9e25 /sys/dev | |
| parent | 65d388f1521fc18ab7ee4305e701ea34691794b4 (diff) | |
Merge with FreeBSD:
o size of tx & rx rings increased
o rx ring init was using the tx ring size constant
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/if_tl.c | 10 | ||||
| -rw-r--r-- | sys/dev/pci/if_tlreg.h | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c index 31a39b173f0..37297f8119f 100644 --- a/sys/dev/pci/if_tl.c +++ b/sys/dev/pci/if_tl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tl.c,v 1.1 1998/10/10 03:55:05 jason Exp $ */ +/* $OpenBSD: if_tl.c,v 1.2 1998/11/11 05:24:13 jason Exp $ */ /* * Copyright (c) 1997, 1998 @@ -31,7 +31,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: if_tl.c,v 1.18 1998/10/08 15:45:36 wpaul Exp $ + * $FreeBSD: if_tl.c,v 1.19 1998/10/31 17:23:48 wpaul Exp $ */ /* @@ -248,7 +248,7 @@ #if !defined(lint) && !defined(__OpenBSD__) static char rcsid[] = - "$FreeBSD: if_tl.c,v 1.18 1998/10/08 15:45:36 wpaul Exp $"; + "$FreeBSD: if_tl.c,v 1.19 1998/10/31 17:23:48 wpaul Exp $"; #endif #ifdef TL_DEBUG @@ -1903,12 +1903,12 @@ static int tl_list_rx_init(sc) cd = &sc->tl_cdata; ld = sc->tl_ldata; - for (i = 0; i < TL_TX_LIST_CNT; i++) { + for (i = 0; i < TL_RX_LIST_CNT; i++) { cd->tl_rx_chain[i].tl_ptr = (struct tl_list_onefrag *)&ld->tl_rx_list[i]; if (tl_newbuf(sc, &cd->tl_rx_chain[i]) == ENOBUFS) return(ENOBUFS); - if (i == (TL_TX_LIST_CNT - 1)) { + if (i == (TL_RX_LIST_CNT - 1)) { cd->tl_rx_chain[i].tl_next = NULL; ld->tl_rx_list[i].tlist_fptr = 0; } else { diff --git a/sys/dev/pci/if_tlreg.h b/sys/dev/pci/if_tlreg.h index 85ecdfa58b0..9f85debc4af 100644 --- a/sys/dev/pci/if_tlreg.h +++ b/sys/dev/pci/if_tlreg.h @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_tlreg.h,v 1.1 1998/10/10 03:55:05 jason Exp $ + * $FreeBSD: if_tlreg.h,v 1.7 1998/10/31 17:23:48 wpaul Exp $ */ @@ -49,8 +49,8 @@ struct tl_type { */ #define TL_MAXFRAGS 10 -#define TL_RX_LIST_CNT 10 -#define TL_TX_LIST_CNT 10 +#define TL_RX_LIST_CNT 20 +#define TL_TX_LIST_CNT 20 #define TL_MIN_FRAMELEN 64 struct tl_frag { @@ -152,7 +152,7 @@ struct tl_softc { /* * Transmit interrupt threshold. */ -#define TX_THR 0x00000001 +#define TX_THR 0x00000004 #define TL_FLAG_FORCEDELAY 1 #define TL_FLAG_SCHEDDELAY 2 |