[src/netbsd-1-4]: src/sys/dev/pci Pull up revision 1.2 (requested by drochner):

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

details:   https://anonhg.NetBSD.org/src/rev/412ae12d20b2
branches:  netbsd-1-4
changeset: 469538:412ae12d20b2
user:      he <he%NetBSD.org@localhost>
date:      Wed Oct 06 13:29:34 1999 +0000

description:
Pull up revision 1.2 (requested by drochner):
  Make it compile in GENERIC by including NS headers.
  Pull in fix from FreeBSD.

diffstat:

 sys/dev/pci/if_ti.c |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r 19e7919bbf3c -r 412ae12d20b2 sys/dev/pci/if_ti.c
--- a/sys/dev/pci/if_ti.c       Wed Oct 06 02:00:42 1999 +0000
+++ b/sys/dev/pci/if_ti.c       Wed Oct 06 13:29:34 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ti.c,v 1.1.2.2 1999/10/05 22:08:51 he Exp $ */
+/* $NetBSD: if_ti.c,v 1.1.2.3 1999/10/06 13:29:34 he Exp $ */
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -119,6 +119,11 @@
 #include <netinet/if_inarp.h>
 #endif
 
+#ifdef NS
+#include <netns/ns.h>
+#include <netns/ns_if.h>
+#endif
+
 #if 0
 #include <vm/vm.h>              /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
@@ -1583,7 +1588,7 @@
        rcb = &sc->ti_rdata->ti_info.ti_mini_rx_rcb;
        TI_HOSTADDR(rcb->ti_hostaddr) = sc->info_dmaaddr +
            ((caddr_t)&sc->ti_rdata->ti_rx_mini_ring - (caddr_t)sc->ti_rdata);
-       rcb->ti_max_len = MHLEN;
+       rcb->ti_max_len = MHLEN - ETHER_ALIGN;
        if (sc->ti_hwrev == TI_HWREV_TIGON)
                rcb->ti_flags = TI_RCB_FLAG_RING_DISABLED;
        else