[src/netbsd-1-5]: src/sys/dev/ic Pull up revision 1.43 via patch (requested ...

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

details:   https://anonhg.NetBSD.org/src/rev/b0de075f903e
branches:  netbsd-1-5
changeset: 490463:b0de075f903e
user:      jhawk <jhawk%NetBSD.org@localhost>
date:      Sun Dec 31 20:14:46 2000 +0000

description:
Pull up revision 1.43  via patch (requested by bouyer):
        Add support for 802.1Q virtual LANs.

diffstat:

 sys/dev/ic/elinkxl.c |  13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r b587f712be46 -r b0de075f903e sys/dev/ic/elinkxl.c
--- a/sys/dev/ic/elinkxl.c      Sun Dec 31 20:14:43 2000 +0000
+++ b/sys/dev/ic/elinkxl.c      Sun Dec 31 20:14:46 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: elinkxl.c,v 1.34.2.1 2000/09/01 00:54:06 haya Exp $    */
+/*     $NetBSD: elinkxl.c,v 1.34.2.2 2000/12/31 20:14:46 jhawk Exp $   */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -437,6 +437,11 @@
        ifp->if_flags =
            IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST;
 
+       /*
+        * We can support 802.1Q VLAN-sized frames.
+        */
+       sc->sc_ethercom.ec_capabilities |= ETHERCAP_VLAN_MTU;
+
        if_attach(ifp);
        ether_ifattach(ifp, macaddr);
 
@@ -1208,8 +1213,10 @@
                                        struct ether_header *eh;
                                        u_int16_t total_len;
 
-
-                                       if (pktstat & EX_UPD_ERR) {
+                                       if (pktstat &
+                                           ((sc->sc_ethercom.ec_capenable &
+                                           ETHERCAP_VLAN_MTU) ?
+                                           EX_UPD_ERR_VLAN : EX_UPD_ERR)) {
                                                ifp->if_ierrors++;
                                                m_freem(m);
                                                goto rcvloop;