Module Name: src
Committed By: martin
Date: Wed Oct 23 19:28:49 UTC 2019
Modified Files:
src/sys/net [netbsd-9]: if_vlan.c
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #367):
sys/net/if_vlan.c: revision 1.147
vlan: get rid of unnecessary if_ipackets++ in vlan_input
It's done by if_input() below now.
Pointed out by msaitoh@
To generate a diff of this commit:
cvs rdiff -u -r1.141.2.1 -r1.141.2.2 src/sys/net/if_vlan.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_vlan.c
diff -u src/sys/net/if_vlan.c:1.141.2.1 src/sys/net/if_vlan.c:1.141.2.2
--- src/sys/net/if_vlan.c:1.141.2.1 Sun Sep 1 11:07:06 2019
+++ src/sys/net/if_vlan.c Wed Oct 23 19:28:49 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vlan.c,v 1.141.2.1 2019/09/01 11:07:06 martin Exp $ */
+/* $NetBSD: if_vlan.c,v 1.141.2.2 2019/10/23 19:28:49 martin Exp $ */
/*
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.141.2.1 2019/09/01 11:07:06 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.141.2.2 2019/10/23 19:28:49 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1656,7 +1656,6 @@ vlan_input(struct ifnet *ifp, struct mbu
}
m_set_rcvif(m, &ifv->ifv_if);
- ifv->ifv_if.if_ipackets++;
if (pfil_run_hooks(ifp->if_pfil, &m, ifp, PFIL_IN) != 0)
goto out;
