Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/net Print oversized frame's message only when DIAGNOSTIC...
details: https://anonhg.NetBSD.org/src/rev/13dba6cd4877
branches: trunk
changeset: 1003831:13dba6cd4877
user: msaitoh <msaitoh%NetBSD.org@localhost>
date: Wed Oct 02 04:17:16 2019 +0000
description:
Print oversized frame's message only when DIAGNOSTIC is set. The message
is not so important because we increment if_iqdrops now.
diffstat:
sys/net/if_ethersubr.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diffs (56 lines):
diff -r b3c67f252474 -r 13dba6cd4877 sys/net/if_ethersubr.c
--- a/sys/net/if_ethersubr.c Wed Oct 02 03:46:21 2019 +0000
+++ b/sys/net/if_ethersubr.c Wed Oct 02 04:17:16 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ethersubr.c,v 1.277 2019/10/01 08:13:16 msaitoh Exp $ */
+/* $NetBSD: if_ethersubr.c,v 1.278 2019/10/02 04:17:16 msaitoh 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.277 2019/10/01 08:13:16 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.278 2019/10/02 04:17:16 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -164,10 +164,12 @@
#include <netmpls/mpls_var.h>
#endif
+#ifdef DIAGNOSTIC
static struct timeval bigpktppslim_last;
static int bigpktppslim = 2; /* XXX */
static int bigpktpps_count;
static kmutex_t bigpktpps_lock __cacheline_aligned;
+#endif
const uint8_t etherbroadcastaddr[ETHER_ADDR_LEN] =
{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
@@ -612,6 +614,7 @@
*/
if (etype != ETHERTYPE_MPLS && m->m_pkthdr.len >
ETHER_MAX_FRAME(ifp, etype, m->m_flags & M_HASFCS)) {
+#ifdef DIAGNOSTIC
mutex_enter(&bigpktpps_lock);
if (ppsratecheck(&bigpktppslim_last, &bigpktpps_count,
bigpktppslim)) {
@@ -619,6 +622,7 @@
ifp->if_xname, m->m_pkthdr.len);
}
mutex_exit(&bigpktpps_lock);
+#endif
ifp->if_iqdrops++;
m_freem(m);
return;
@@ -1718,6 +1722,8 @@
etherinit(void)
{
+#ifdef DIAGNOSTIC
mutex_init(&bigpktpps_lock, MUTEX_DEFAULT, IPL_NET);
+#endif
ether_sysctl_setup(NULL);
}
Home |
Main Index |
Thread Index |
Old Index