[src/netbsd-3]: src/sys/dev/sbus Pull up following revision(s) (requested by ...

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

details:   https://anonhg.NetBSD.org/src/rev/d679dc878538
branches:  netbsd-3
changeset: 577444:d679dc878538
user:      tron <tron%NetBSD.org@localhost>
date:      Sun Nov 06 13:24:45 2005 +0000

description:
Pull up following revision(s) (requested by bouyer in ticket #933):
        sys/dev/sbus/be.c: revision 1.46
ETHERCAP_VLAN_MTU is a flag for ec_capabilities, the size of the 802.1q
encaptulation header is ETHER_VLAN_ENCAP_LEN. Pointed out by der Mouse on
tech-kern.

diffstat:

 sys/dev/sbus/be.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 5673cab73190 -r d679dc878538 sys/dev/sbus/be.c
--- a/sys/dev/sbus/be.c Sat Nov 05 06:59:28 2005 +0000
+++ b/sys/dev/sbus/be.c Sun Nov 06 13:24:45 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: be.c,v 1.45 2005/02/04 02:10:47 perry Exp $    */
+/*     $NetBSD: be.c,v 1.45.4.1 2005/11/06 13:24:45 tron Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.45 2005/02/04 02:10:47 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.45.4.1 2005/11/06 13:24:45 tron Exp $");
 
 #include "opt_ddb.h"
 #include "opt_inet.h"
@@ -588,7 +588,7 @@
        struct mbuf *m;
 
        if (len <= sizeof(struct ether_header) ||
-           len > ETHER_MAX_LEN + ETHERCAP_VLAN_MTU) {
+           len > ETHER_MAX_LEN + ETHER_VLAN_ENCAP_LEN) {
 #ifdef BEDEBUG
                if (sc->sc_debug)
                        printf("%s: invalid packet size %d; dropping\n",