[src/trunk]: src/sys/dev/pci Fix Buffer Manager Mbuf Pool settings which was ...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8743aa837431
branches:  trunk
changeset: 785543:8743aa837431
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Tue Mar 19 02:56:16 2013 +0000

description:
Fix Buffer Manager Mbuf Pool settings which was modified in rev. 1.202.

diffstat:

 sys/dev/pci/if_bge.c |  18 ++++--------------
 1 files changed, 4 insertions(+), 14 deletions(-)

diffs (40 lines):

diff -r 75b50457844f -r 8743aa837431 sys/dev/pci/if_bge.c
--- a/sys/dev/pci/if_bge.c      Tue Mar 19 02:07:43 2013 +0000
+++ b/sys/dev/pci/if_bge.c      Tue Mar 19 02:56:16 2013 +0000
@@ -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 @@
                        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