[src/netbsd-1-5]: src/sys/net Pull up revision 1.25 (requested by thorpej):

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

details:   https://anonhg.NetBSD.org/src/rev/e693c6802b6c
branches:  netbsd-1-5
changeset: 491857:e693c6802b6c
user:      he <he%NetBSD.org@localhost>
date:      Thu Jun 07 17:00:01 2001 +0000

description:
Pull up revision 1.25 (requested by thorpej):
  Consider the configured MTU of the interface when determining
  if a packet is too large.

diffstat:

 sys/net/if_ether.h |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (20 lines):

diff -r b4b59c40a83f -r e693c6802b6c sys/net/if_ether.h
--- a/sys/net/if_ether.h        Thu Jun 07 16:50:25 2001 +0000
+++ b/sys/net/if_ether.h        Thu Jun 07 17:00:01 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ether.h,v 1.17.2.1 2000/12/31 20:14:25 jhawk Exp $  */
+/*     $NetBSD: if_ether.h,v 1.17.2.2 2001/06/07 17:00:01 he Exp $     */
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -81,8 +81,8 @@
  * Compute the maximum frame size based on ethertype (i.e. possible
  * encapsulation) and whether or not an FCS is present.
  */
-#define        ETHER_MAX_FRAME(etype, hasfcs)                                  \
-       (ETHERMTU + ETHER_HDR_LEN +                                     \
+#define        ETHER_MAX_FRAME(ifp, etype, hasfcs)                             \
+       ((ifp)->if_mtu + ETHER_HDR_LEN +                                \
         ((hasfcs) ? ETHER_CRC_LEN : 0) +                               \
         (((etype) == ETHERTYPE_VLAN) ? ETHER_VLAN_ENCAP_LEN : 0))