Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci Remove the "panic("wm_init: MCLBYTES > 2048 not ...



details:   https://anonhg.NetBSD.org/src/rev/0f29bed9962a
branches:  trunk
changeset: 566345:0f29bed9962a
user:      ragge <ragge%NetBSD.org@localhost>
date:      Thu May 06 10:06:50 2004 +0000

description:
Remove the "panic("wm_init: MCLBYTES > 2048 not supported.");" stuff,
the driver works very well with larger MCLBYTES.

diffstat:

 sys/dev/pci/if_wm.c |  12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diffs (40 lines):

diff -r 74f2909a8c6b -r 0f29bed9962a sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Thu May 06 09:07:54 2004 +0000
+++ b/sys/dev/pci/if_wm.c       Thu May 06 10:06:50 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.69 2004/04/09 17:51:18 thorpej Exp $       */
+/*     $NetBSD: if_wm.c,v 1.70 2004/05/06 10:06:50 ragge Exp $ */
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.69 2004/04/09 17:51:18 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.70 2004/05/06 10:06:50 ragge Exp $");
 
 #include "bpfilter.h"
 #include "rnd.h"
@@ -2484,11 +2484,6 @@
        if(MCLBYTES == 2048) {
                sc->sc_rctl |= RCTL_2k;
        } else {
-       /*
-        * XXX MCLBYTES > 2048 causes "Tx packet consumes too many DMA"
-        * XXX segments, dropping" -- why?
-        */
-#if 0
                if(sc->sc_type >= WM_T_82543) {
                        switch(MCLBYTES) {
                        case 4096:
@@ -2506,9 +2501,6 @@
                                break;
                        }
                } else panic("wm_init: i82542 requires MCLBYTES = 2048");
-#else
-               panic("wm_init: MCLBYTES > 2048 not supported.");
-#endif
        }
 
        /* Set the receive filter. */



Home | Main Index | Thread Index | Old Index