[src/netbsd-3]: src/sys Pullup (requested by chs in ticket #912)

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

details:   https://anonhg.NetBSD.org/src/rev/3ff49ecac791
branches:  netbsd-3
changeset: 577410:3ff49ecac791
user:      jmc <jmc%NetBSD.org@localhost>
date:      Fri Oct 28 20:12:42 2005 +0000

description:
Pullup  (requested by chs in ticket #912)
 Fix txp cards so this compiles and enable in GENERIC.

diffstat:

 sys/arch/i386/conf/GENERIC |  7 ++++---
 sys/dev/pci/if_txp.c       |  6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diffs (62 lines):

diff -r c591147952d0 -r 3ff49ecac791 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Fri Oct 28 20:07:02 2005 +0000
+++ b/sys/arch/i386/conf/GENERIC        Fri Oct 28 20:12:42 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.661.2.7 2005/09/15 23:33:43 snj Exp $
+# $NetBSD: GENERIC,v 1.661.2.8 2005/10/28 20:12:42 jmc Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.661.2.7 $"
+#ident                 "GENERIC-$Revision: 1.661.2.8 $"
 
 maxusers       32              # estimated number of users
 
@@ -780,7 +780,7 @@
 ipw*   at pci? dev ? function ?        # Intel PRO/Wireless 2100
 iwi*   at pci? dev ? function ?        # Intel PRO/Wireless 2200BG
 gsip*  at pci? dev ? function ?        # NS83820 Gigabit Ethernet
-#hme*  at pci? dev ? function ?        # Sun Microelectronics STP2002-STQ
+hme*   at pci? dev ? function ?        # Sun Microelectronics STP2002-STQ
 le*    at pci? dev ? function ?        # PCnet-PCI Ethernet
 lmc*   at pci? dev ? function ?        # Lan Media Corp SSI/HSSI/DS3
 mtd*   at pci? dev ? function ?        # Myson MTD803 3-in-1 Ethernet
@@ -798,6 +798,7 @@
 ti*    at pci? dev ? function ?        # Alteon ACEnic gigabit Ethernet
 tl*    at pci? dev ? function ?        # ThunderLAN-based Ethernet
 tlp*   at pci? dev ? function ?        # DECchip 21x4x and clones
+txp*   at pci? dev ? function ?        # 3com 3cr990
 vge*   at pci? dev ? function ?        # VIATech VT612X Gigabit Ethernet
 vr*    at pci? dev ? function ?        # VIA Rhine Fast Ethernet
 wi*    at pci? dev ? function ?        # Intersil Prism Mini-PCI (802.11b)
diff -r c591147952d0 -r 3ff49ecac791 sys/dev/pci/if_txp.c
--- a/sys/dev/pci/if_txp.c      Fri Oct 28 20:07:02 2005 +0000
+++ b/sys/dev/pci/if_txp.c      Fri Oct 28 20:12:42 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_txp.c,v 1.10 2005/02/27 00:27:33 perry Exp $ */
+/* $NetBSD: if_txp.c,v 1.10.2.1 2005/10/28 20:12:42 jmc Exp $ */
 
 /*
  * Copyright (c) 2001
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.10 2005/02/27 00:27:33 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.10.2.1 2005/10/28 20:12:42 jmc Exp $");
 
 #include "bpfilter.h"
 #include "opt_inet.h"
@@ -1467,7 +1467,7 @@
                if (++cnt >= (TX_ENTRIES - 4))
                        goto oactive;
 
-               if ((mtag = VLAN_OUTPUT_TAG(sc->sc_ethercom, m)))
+               if ((mtag = VLAN_OUTPUT_TAG(&sc->sc_arpcom, m)))
                        txd->tx_pflags = TX_PFLAGS_VLAN |
                          (htons(VLAN_TAG_VALUE(mtag)) << TX_PFLAGS_VLANTAG_S);