[src/netbsd-1-6]: src/sys/dev/ic Pullup revisions 1.19-1.21 (requested by bou...

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

details:   https://anonhg.NetBSD.org/src/rev/7eae282c3050
branches:  netbsd-1-6
changeset: 529944:7eae282c3050
user:      jmc <jmc%NetBSD.org@localhost>
date:      Mon Jan 27 04:42:31 2003 +0000

description:
Pullup revisions 1.19-1.21 (requested by bouyer in ticket #1088)
 zero out the remaining of last mbuf when padding the packet to
 ETHER_MIN_LEN
 XXX should it be ETHER_MIN_LEN-ETHER_CRC_LEN ?
 XXX2 we assume there is enouth room in the last mbuf. The code already
      assumes this in other places.
 Hum, ragge said this chip should autopad, so just remove the check.

diffstat:

 sys/dev/ic/sgec.c |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (27 lines):

diff -r 0e9f79564df3 -r 7eae282c3050 sys/dev/ic/sgec.c
--- a/sys/dev/ic/sgec.c Mon Jan 27 04:37:04 2003 +0000
+++ b/sys/dev/ic/sgec.c Mon Jan 27 04:42:31 2003 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: sgec.c,v 1.18 2001/11/13 13:14:44 lukem Exp $ */
+/*      $NetBSD: sgec.c,v 1.18.10.1 2003/01/27 04:42:31 jmc Exp $ */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
  *
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sgec.c,v 1.18 2001/11/13 13:14:44 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sgec.c,v 1.18.10.1 2003/01/27 04:42:31 jmc Exp $");
 
 #include "opt_inet.h"
 #include "bpfilter.h"
@@ -370,8 +370,6 @@
                        if (totlen == len)
                                orword = ZE_TDES1_FS;
                        if (totlen == m->m_pkthdr.len) {
-                               if (totlen < ETHER_MIN_LEN)
-                                       len += (ETHER_MIN_LEN - totlen);
                                orword |= ZE_TDES1_LS;
                                sc->sc_txmbuf[idx] = m;
                        }