diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2008-04-20 01:18:03 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2008-04-20 01:18:03 +0000 |
| commit | 72af29d7a22fd5a1e4f31d18f0f94f7bb2bb2d88 (patch) | |
| tree | 41840f6d33518e60113f03efaf250e91fe49c683 /sys/dev | |
| parent | 7f785367825a4507df22bc668a23233754983dae (diff) | |
Move the threshold fix from the re(4) code back into the header as
it was going to be before the release. No functional change.
prodded by kettenis@ ok dlg@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/re.c | 5 | ||||
| -rw-r--r-- | sys/dev/ic/rtl81x9reg.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sys/dev/ic/re.c b/sys/dev/ic/re.c index 58011d1b19d..8b5ab601574 100644 --- a/sys/dev/ic/re.c +++ b/sys/dev/ic/re.c @@ -1,4 +1,4 @@ -/* $OpenBSD: re.c,v 1.81 2008/04/20 01:15:40 brad Exp $ */ +/* $OpenBSD: re.c,v 1.82 2008/04/20 01:18:02 brad Exp $ */ /* $FreeBSD: if_re.c,v 1.31 2004/09/04 07:54:05 ru Exp $ */ /* * Copyright (c) 1997, 1998-2003 @@ -1864,8 +1864,7 @@ re_init(struct ifnet *ifp) CSR_WRITE_1(sc, RL_EARLY_TX_THRESH, 16); - CSR_WRITE_4(sc, RL_RXCFG, - RL_RXFIFO_NOTHRESH|RL_RX_MAXDMA|RL_RX_BUF_SZ); + CSR_WRITE_4(sc, RL_RXCFG, RL_RXCFG_CONFIG); /* Set the individual bit to receive frames for this host only. */ rxcfg = CSR_READ_4(sc, RL_RXCFG); diff --git a/sys/dev/ic/rtl81x9reg.h b/sys/dev/ic/rtl81x9reg.h index 169c194a62d..0a044681e3e 100644 --- a/sys/dev/ic/rtl81x9reg.h +++ b/sys/dev/ic/rtl81x9reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rtl81x9reg.h,v 1.46 2008/04/20 01:15:40 brad Exp $ */ +/* $OpenBSD: rtl81x9reg.h,v 1.47 2008/04/20 01:18:02 brad Exp $ */ /* * Copyright (c) 1997, 1998 @@ -460,7 +460,7 @@ #define RL_MIN_FRAMELEN 60 #define RL_TXTHRESH(x) ((x) << 11) #define RL_TX_THRESH_INIT 96 -#define RL_RX_FIFOTHRESH RL_RXFIFO_256BYTES +#define RL_RX_FIFOTHRESH RL_RXFIFO_NOTHRESH #define RL_RX_MAXDMA RL_RXDMA_UNLIMITED #define RL_TX_MAXDMA RL_TXDMA_2048BYTES |