Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-9]: src/sys/net Pull up following revision(s) (requested by ozaki...



details:   https://anonhg.NetBSD.org/src/rev/28906ca24275
branches:  netbsd-9
changeset: 1001040:28906ca24275
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Oct 23 19:28:49 2019 +0000

description:
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@

diffstat:

 sys/net/if_vlan.c |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r 8405ac9b47ba -r 28906ca24275 sys/net/if_vlan.c
--- a/sys/net/if_vlan.c Wed Oct 23 19:25:39 2019 +0000
+++ b/sys/net/if_vlan.c Wed Oct 23 19:28:49 2019 +0000
@@ -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 @@
        }
 
        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;



Home | Main Index | Thread Index | Old Index