Module Name: src
Committed By: maxv
Date: Mon Feb 12 12:17:38 UTC 2018
Modified Files:
src/sys/net: if_ethersubr.c
Log Message:
Fix typo, and add a comment about MPLS.
To generate a diff of this commit:
cvs rdiff -u -r1.257 -r1.258 src/sys/net/if_ethersubr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.257 src/sys/net/if_ethersubr.c:1.258
--- src/sys/net/if_ethersubr.c:1.257 Fri Jan 19 12:31:27 2018
+++ src/sys/net/if_ethersubr.c Mon Feb 12 12:17:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ethersubr.c,v 1.257 2018/01/19 12:31:27 nakayama Exp $ */
+/* $NetBSD: if_ethersubr.c,v 1.258 2018/02/12 12:17:38 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.257 2018/01/19 12:31:27 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.258 2018/02/12 12:17:38 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -260,7 +260,7 @@ ether_output(struct ifnet * const ifp0,
void *tha = ar_tha(ah);
if (tha == NULL) {
- /* fake with ARPHDR_IEEE1394 */
+ /* fake with ARPHRD_IEEE1394 */
m_freem(m);
return 0;
}
@@ -606,7 +606,8 @@ ether_input(struct ifnet *ifp, struct mb
}
/*
- * Determine if the packet is within its size limits.
+ * Determine if the packet is within its size limits. For MPLS the
+ * header length is variable, so we skip the check.
*/
if (etype != ETHERTYPE_MPLS && m->m_pkthdr.len >
ETHER_MAX_FRAME(ifp, etype, m->m_flags & M_HASFCS)) {
