[src/netbsd-2-0]: src/sys/dev/pci Pull up revision 1.2 (requested by toshii i...

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

details:   https://anonhg.NetBSD.org/src/rev/37d03ca8ba2b
branches:  netbsd-2-0
changeset: 561498:37d03ca8ba2b
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Jun 21 17:18:38 2004 +0000

description:
Pull up revision 1.2 (requested by toshii in ticket #517):
Fix brokenness I introduced while debugging.
  - initialize rxlenmask when 8139C+
  - remove meaningless memsets.

diffstat:

 sys/dev/pci/if_re.c |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (29 lines):

diff -r f62c4c837dd0 -r 37d03ca8ba2b sys/dev/pci/if_re.c
--- a/sys/dev/pci/if_re.c       Mon Jun 21 17:13:46 2004 +0000
+++ b/sys/dev/pci/if_re.c       Mon Jun 21 17:18:38 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_re.c,v 1.4.2.3 2004/06/21 17:13:46 tron Exp $       */
+/*     $NetBSD: if_re.c,v 1.4.2.4 2004/06/21 17:18:38 tron Exp $       */
 /*
  * Copyright (c) 1997, 1998-2003
  *     Bill Paul <wpaul%windriver.com@localhost>.  All rights reserved.
@@ -849,6 +849,8 @@
 
                /* Set RX length mask */
 
+               sc->rtk_rxlenmask = RTK_RDESC_STAT_FRAGLEN;
+
                if (rtk_read_eeprom(sc, RTK_EE_ID, RTK_EEADDR_LEN1) == 0x8129)
                        addr_len = RTK_EEADDR_LEN1;
                else
@@ -864,10 +866,6 @@
                }
        }
 
-       memset((char *)&sc->rtk_ldata.rtk_rx_mbuf, 0,
-           (RTK_RX_DESC_CNT * sizeof(struct mbuf *)));
-       memset((char *)&sc->rtk_ldata.rtk_tx_mbuf, 0,
-           (RTK_TX_DESC_CNT * sizeof(struct mbuf *)));
        error = re_allocmem(sc);
 
        if (error)