Module Name: src
Committed By: msaitoh
Date: Tue Mar 19 02:56:17 UTC 2013
Modified Files:
src/sys/dev/pci: if_bge.c
Log Message:
Fix Buffer Manager Mbuf Pool settings which was modified in rev. 1.202.
To generate a diff of this commit:
cvs rdiff -u -r1.217 -r1.218 src/sys/dev/pci/if_bge.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.217 src/sys/dev/pci/if_bge.c:1.218
--- src/sys/dev/pci/if_bge.c:1.217 Sun Mar 17 18:46:10 2013
+++ src/sys/dev/pci/if_bge.c Tue Mar 19 02:56:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.217 2013/03/17 18:46:10 msaitoh Exp $ */
+/* $NetBSD: if_bge.c,v 1.218 2013/03/19 02:56:16 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.217 2013/03/17 18:46:10 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.218 2013/03/19 02:56:16 msaitoh Exp $");
#include "vlan.h"
@@ -2528,19 +2528,9 @@ bge_blockinit(struct bge_softc *sc)
CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_MACRX_LOWAT, 0x10);
CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_HIWAT, 0x60);
}
- } else if (!BGE_IS_5705_PLUS(sc)) {
- if (ifp->if_mtu > ETHER_MAX_LEN) {
- CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_READDMA_LOWAT, 0x50);
- CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_MACRX_LOWAT, 0x20);
- CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_HIWAT, 0x60);
- } else {
- CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_READDMA_LOWAT, 304);
- CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_MACRX_LOWAT, 152);
- CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_HIWAT, 380);
- }
} else {
- CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_READDMA_LOWAT, 0x0);
- CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_MACRX_LOWAT, 0x10);
+ CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_READDMA_LOWAT, 0x50);
+ CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_MACRX_LOWAT, 0x20);
CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_HIWAT, 0x60);
}
#endif
