diff options
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/if_em.c | 5 | ||||
| -rw-r--r-- | sys/dev/pci/if_em.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c index 4b5b7bb2619..06937b62cf8 100644 --- a/sys/dev/pci/if_em.c +++ b/sys/dev/pci/if_em.c @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ -/* $OpenBSD: if_em.c,v 1.157 2006/11/17 02:03:32 brad Exp $ */ +/* $OpenBSD: if_em.c,v 1.158 2006/11/18 18:39:14 brad Exp $ */ /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */ #include <dev/pci/if_em.h> @@ -669,9 +669,8 @@ em_init(void *arg) sc->tx_head_addr = pba << EM_TX_HEAD_ADDR_SHIFT; sc->tx_fifo_size = (E1000_PBA_40K - pba) << EM_PBA_BYTES_SHIFT; break; - /* Total Packet Buffer on these is 48k */ case em_82571: - case em_82572: + case em_82572: /* Total Packet Buffer on these is 48k */ case em_80003es2lan: pba = E1000_PBA_32K; /* 32K for Rx, 16K for Tx */ break; diff --git a/sys/dev/pci/if_em.h b/sys/dev/pci/if_em.h index 282532e61c4..73057a04005 100644 --- a/sys/dev/pci/if_em.h +++ b/sys/dev/pci/if_em.h @@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ /* $FreeBSD: if_em.h,v 1.26 2004/09/01 23:22:41 pdeuskar Exp $ */ -/* $OpenBSD: if_em.h,v 1.33 2006/11/17 02:03:32 brad Exp $ */ +/* $OpenBSD: if_em.h,v 1.34 2006/11/18 18:39:14 brad Exp $ */ #ifndef _EM_H_DEFINED_ #define _EM_H_DEFINED_ @@ -180,7 +180,7 @@ POSSIBILITY OF SUCH DAMAGE. #define EM_TX_TIMEOUT 5 /* set to 5 seconds */ /* - * These parameter controls when the driver calls the routine to reclaim + * These parameters control when the driver calls the routine to reclaim * transmit descriptors. */ #define EM_TX_CLEANUP_THRESHOLD (sc->num_tx_desc / 8) |